Merge branch 'feature/add_scroll_spy_#170' into staging

Conflicts:
	app/assets/javascripts/custom.js.coffee
	app/views/web/events/index.html.haml
	app/views/web/lectors/index.html.haml
Merge branch 'feature/178_add_time_slots' into staging

Conflicts:
	app/assets/javascripts/custom.js.coffee