branch
branches work
Merge branch 'user' of https://github.com/CateRate/CateRate into user

Conflicts:
	www/js/controllers.js
checkboxes in branches
Merge branch 'user' of https://github.com/CateRate/CateRate into user

Conflicts:
	www/templates/_organizations.html