Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGELOG.md
#	app/build.gradle
#	app/src/main/java/com/donnKey/aesopPlayer/ui/provisioning/Provisioning.java

Author: DonnKey

app/src/main/java/com/donnKey/aesopPlayer/ui/provisioning/Provisioning.java

@@ -31,6 +31,7 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.provider.MediaStore;
+import android.util.Log;
 
 import com.donnKey.aesopPlayer.AesopPlayerApplication;
 import com.donnKey.aesopPlayer.GlobalSettings;
@@ -45,6 +46,7 @@
 import com.donnKey.aesopPlayer.util.AwaitResume;
 import com.donnKey.aesopPlayer.util.FilesystemUtil;
 import com.google.common.base.Preconditions;
+import com.google.common.io.Files;
 
 import org.apache.commons.compress.utils.IOUtils;