commit utilities
Merge origin/master

Conflicts:
	app/routes/user.js
	app/scripts/controllers/ProfileCtrl.js
commit