For you Knomle
ForYou
Merge branch 'master' of https://github.com/TheMHMoritz3/OpenCalc

Conflicts:
	OpenCalc-Android/OpenCalc-Android.userprefs
	OpenCalc-Android/Resources/Resource.designer.cs
	OpenCalc-Android/Resources/values/Strings.xml
	OpenCalc-Android/obj/Debug/OpenCalc-Android.csproj.FileListAbsolute.txt
	OpenCalc-Android/obj/Debug/acw-map.txt
	OpenCalc-Android/obj/Debug/android/bin/classes.dex

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R$attr.class

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R$drawable.class

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R$id.class

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R$layout.class

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R$string.class

	OpenCalc-Android/obj/Debug/android/bin/classes/opencalc_android/opencalc_android/R.class

	OpenCalc-Android/obj/Debug/android/opencalc_android/opencalc_android/R.java

	OpenCalc-Android/obj/Debug/android/src/opencalc_android/opencalc_android/R.java
	OpenCalc-Android/obj/Debug/res/layout/main.xml