Merge branch 'develop' of https://github.com/Rolf-Smit/Android-Retainable-Tasks into develop

Conflicts:
	demo/src/main/java/org/neotech/app/retainabletasksdemo/Main.java
	library/src/main/java/org/neotech/library/retainabletasks/TaskManager.java

Author: Rolf-Smit

demo/src/main/java/org/neotech/app/retainabletasksdemo/Main.java

@@ -43,30 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
         retainUserInterfaceButton.setOnClickListener(this);
     }
 
-/*
-    @Override
-    protected void onStart() {
-        super.onStart();
-        progressDialog = ProgressDialog.getExistingInstance(getSupportFragmentManager(), DIALOG_PROGRESS);
-    }
-
-        getTaskManager().attach(TASK_PROGRESS, this);
-
-
-        getTaskManager().attach(TASK_RETAIN_UI_STATE, new TaskManager.TaskAttachListener() {
-            @Override
-            public Task.Callback onPreAttach(Task<?, ?> task) {
-
-                if (!task.isResultDelivered()) { //This call isn't necessary.
-                    retainUserInterfaceButton.setEnabled(false);
-                    retainUserInterfaceButton.setText("" + task.getLastKnownProgress());
-                }
-                return Main.this;
-            }
-        });
-    }
-    */
-
     @Override
     public Task.Callback onPreAttach(@NonNull Task<?, ?> task) {
         if(task.getTag().equals(TASK_RETAIN_UI_STATE)){