fixes scheduler bug
updates design of schedule on conference landing
updates schedule design on conference landing
Merge pull request #39 from kodgemisi/confdeck-59

Confdeck 59
Merge branch 'development' into confdeck-45

Conflicts:
	app/controllers/conferences_controller.rb
	app/models/slot.rb
	app/views/schedule/show.html.erb