For merge
Merge branch 'master' of github.com:ducdigital/s42m

Conflicts:
	platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/CordovaLib/ant-build/classes.jar
	platforms/android/CordovaLib/ant-gen/R.java.d
	platforms/android/ant-build/AndroidManifest.xml.d
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk.d
	platforms/android/ant-build/HelloCordova.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/ant-build/classes.dex.d
	platforms/android/ant-gen/R.java.d
	platforms/android/assets/www/css/app.css
	platforms/android/assets/www/css/app.min.css
	www/js/app.js