Saved user
Merge branch 'user' of https://github.com/CateRate/CateRate into user
login
Merge branch 'user' of https://github.com/CateRate/CateRate into user
Add places
Merge branch 'user' of https://github.com/CateRate/CateRate into user

Conflicts:
	www/templates/_user.html