Merge branch 'master' of https://github.com/cooleo400/wheresthesub

Conflicts:
	platforms/ios/cordova/console.log
	platforms/ios/www/index.html
	www/index.html