commented out cordova.js
commented out cordova.js
Merge branch 'master' into develop

Conflicts:
	www/index.html