comments and tickets
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/controllers/comments_controller.rb
	app/controllers/events_controller.rb
	app/models/event.rb
	app/views/events/_form.html.erb
	app/views/events/show.html.erb
	db/schema.rb