Cleaned up the app.
Merge branch 'master' of https://github.com/etoxin/findmejohnny

Conflicts:
	app/production/js/app.js