Merge branch 'feature/add_scroll_spy_#170' into develop

Conflicts:
	app/assets/javascripts/custom.js.coffee
	app/views/layouts/web/shared/_navigation.html.haml
	app/views/web/events/index.html.haml
	app/views/web/lectors/index.html.haml
Return social widgets at footer.
fix ckeditor uploader paths
Merge branch 'develop' into staging

Conflicts:
	app/assets/javascripts/custom.js.coffee
	app/views/layouts/web/shared/_navigation.html.haml
	app/views/web/events/index.html.haml
	app/views/web/lectors/index.html.haml