remove compiled files
remove compiled files
Merge branch 'master' into production
add compiled files
Merge remote-tracking branch 'origin/master' into production

Conflicts:
	app/assets/js/controllers/events.controller.coffee
add compiled files