Added Event Details
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	log/development.log