07/10
Merge branch 'master' of https://github.com/ticketapp/master

Conflicts:
	public/js/controllers/events.js