Merge branch 'sslfix_0.9.8'

Conflicts:
	src/KeePass.sln
	src/keepass2android/Properties/AndroidManifest_net.xml

src/keepass2android/ChangeLog.cs

@@ -26,6 +26,7 @@ namespace keepass2android
 			AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
+				ctx.GetString(Resource.String.ChangeLog_0_9_8c),				
 					ctx.GetString(Resource.String.ChangeLog_0_9_8b),				
 					ctx.GetString(Resource.String.ChangeLog_0_9_8),
 #if !NoNet

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="57" 
-			android:versionName="0.9.8 preview 2 (alpha)" 
+			android:versionCode="60" 
+			android:versionName="0.9.8c" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />

src/keepass2android/Resources/values/strings.xml

@@ -540,6 +540,13 @@
 	
 	<string name="Continue">Continue</string>
 	<string name="NoFilenameWarning">The URI you have entered does not look like a filename. Are you sure this is a valid file?</string>
+
+  <string name="ChangeLog_0_9_8c">
+    Version 0.9.8c\n
+    * Fix for SSL vulnerability in Microsoft Live SDK (used when accessing files via OneDrive)\n
+    * Bug fix: Previous release contained two input methods (one crashing)\n
+  </string>
+  
 		<string name="ChangeLog_0_9_8b">
 		Version 0.9.8b\n
 		* Bug fixes (Saving failed for some databases, exporting to local device not working, selecting some preference options crashed the app)\n