Including Brad's Changes

Updating style sheets and a lot of the app pages
Merge branch 'NArnold'

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/event_times/_form.html.erb
	app/views/event_times/new.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/locations/new.html.erb
	app/views/votes/_form.html.erb
	app/views/votes/show.html.erb
adding brad's changes
fixing merge conflicts?!

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/event_times/_form.html.erb
	app/views/event_times/new.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/locations/new.html.erb
	app/views/votes/_form.html.erb
	app/views/votes/show.html.erb