code clean
Merge branch 'master' of https://github.com/ticketapp/master

Conflicts:
	public/js/controllers/users.js