123

213
Merge branch 'master' of https://github.com/fx0883/SharpApp

Conflicts:
	sharpApp/platforms/android/AndroidManifest.xml