JS Fixes
JS Fixes

Conflicts:
	android/assets/www/js/main.js
	ios/www/js/main.js