Merge branch 'master' of https://git01.codeplex.com/keepass2android

Conflicts:
	src/java/JavaFileStorage/bin/javafilestorage.jar

src/Kp2aBusinessLogic/Io/BuiltInFileStorage.cs

@@ -246,6 +246,11 @@ namespace keepass2android.Io
 			activity.OnImmediateResult(requestCode, (int) FileStorageResults.FileUsagePrepared, intent);
 		}
 
+		public void PrepareFileUsage(Context ctx, IOConnectionInfo ioc)
+		{
+			//nothing to do, we're ready to go
+		}
+
 		public void OnCreate(IFileStorageSetupActivity activity, Bundle savedInstanceState)
 		{
 			throw new NotImplementedException();