123

123
Merge remote-tracking branch 'origin/master'

Conflicts:
	sharpApp/platforms/android/bin/SharpApp.apk
	sharpApp/platforms/android/bin/resources.ap_