Got rid of event.event_date_time everywhere and replaced it with event.event_date
and event.event_time
Merge branch 'develop' of http://github.com/yeaz/dancespace into develop

Conflicts:
	app/views/events/show.html.erb