Merge branch 'feature/101_add_redirects' into staging
Merge branch 'feature/114_show_company_on_lectors_page' into staging

Conflicts:
	app/views/web/lectors/index.html.haml