Merge branch 'master' of https://github.com/ulrichson/key-hunter-mobile

Conflicts:
	www/index.html
	www/js/app.js
Merge remote-tracking branch 'origin/master'

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