Commit changes after making build work
Merge remote-tracking branch 'origin/master'

Conflicts:
	platforms/android/bin/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	platforms/android/bin/AndroidManifest.xml