Fixes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/HelloWorld-debug-unaligned.apk
	platforms/android/ant-build/HelloWorld-debug.apk
	platforms/android/ant-build/HelloWorld.ap_
	platforms/android/ant-build/HelloWorld.ap_.d
	platforms/android/ant-build/build.prop
	www/js/engine.js