Fix a lot of things
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/events_controller.rb
	app/views/comments/new.html.erb
	app/views/events/edit.html.erb
	app/views/events/show.html.erb
	app/views/layouts/_menu.html.erb
	app/views/reservations/show.html.erb