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

Conflicts:
	.gitignore
	src/java/InputStickAPI/gen/com/inputstick/api/R.java
	src/java/PluginInputStick/gen/com/inputstick/api/R.java
	src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java
	src/java/PluginInputStick/gen/keepass2android/pluginsdk/R.java
	src/keepass2android/Resources/Resource.designer.cs

src/KeePassLib2Android/Resources/Resource.designer.cs

@@ -1,57 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.34014
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)]
-
-namespace KeePassLib2Android
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		static Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-		}
-		
-		public partial class Attribute
-		{
-			
-			static Attribute()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Attribute()
-			{
-			}
-		}
-		
-		public partial class String
-		{
-			
-			// aapt resource value: 0x7f020000
-			public static int library_name = 2130837504;
-			
-			static String()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private String()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591