hf
Merge remote-tracking branch 'origin/user' into user

Conflicts:
	www/js/controllers.js