fixed jquery to hide inputs on locations page
Merge branch 'master' of https://github.com/nojoek/lets530 into bondy

Conflicts:
	app/views/event_times/_form.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/votes/show.html.erb

trying to fix merge conflicts
Merge pull request #5 from nojoek/bondy

Bondy