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

Conflicts:
	platforms/android/assets/www/css/app.css
	platforms/android/assets/www/css/app.min.css
	platforms/android/assets/www/js/app.js