event change
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/new.html.erb
	app/views/events/_form.html.erb
	app/views/events/new.html.erb