Merge branches 'F2_seed' and 'f1_login' of https://github.com/CateRate/CateRate into F2_seed

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