Jen's edits to app.js

Also ignored generated classes etc
Merge branch 'master' of https://github.com/thehogfather/chi-bingo

Conflicts:
	platforms/ios/www/index.html
	platforms/ios/www/js/app.js
	www/index.html
	www/js/app.js