Merged develop into master

Author: Rolf-Smit

README.md

@@ -17,7 +17,7 @@ Android-Retainable-Tasks is available on jCenter, just add the following compile
 
 ```groovy
 dependencies {
-    compile 'org.neotech.library:android-retainable-tasks:0.2.4'
+    compile 'org.neotech.library:android-retainable-tasks:0.2.5'
 }
 ```
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong

library/build.gradle

@@ -16,7 +16,7 @@ ext {
     artifact = 'android-retainable-tasks'
 
     libraryDescription = 'Android-Retainable-Tasks is an easy to use mini-library for easy asynchronous background tasking with callback support to the UI. This library is based on the Android AsyncTask implementation but with support for retaining tasks and therefore surviving configuration changes (orientation).'
-    libraryVersion = '0.2.4'
+    libraryVersion = '0.2.5'
 
     siteUrl = 'https://github.com/NeoTech-Software/Android-Retainable-Tasks'
     gitUrl = 'https://github.com/NeoTech-Software/Android-Retainable-Tasks.git'

library/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest package="org.neotech.library.retainabletasks"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-sdk tools:overrideLibrary="android.support.v7.appcompat" />
+    <uses-sdk tools:overrideLibrary="android.support.v7.appcompat, android.support.v4.appcompat" />
 </manifest>

library/src/main/java/org/neotech/library/retainabletasks/TaskManagerLifeCycleProxy.java

@@ -54,7 +54,7 @@ public TaskManager getTaskManager(){
             return fragmentTaskManager;
         }
         if(provider instanceof FragmentActivity){
-            fragmentTaskManager = (BaseTaskManager) TaskManager.getActivityTaskManager(((FragmentActivity) provider).getFragmentManager());
+            fragmentTaskManager = (BaseTaskManager) TaskManager.getActivityTaskManager(((FragmentActivity) provider).getSupportFragmentManager());
         } else if(provider instanceof Fragment){
             fragmentTaskManager = (BaseTaskManager) TaskManager.getFragmentTaskManager((Fragment) provider);
         } else if(provider instanceof Activity){