Merge branch 'master' of github.com:mfandrade/palestras-coletivas

Conflicts:
	app/controllers/events_controller.rb