fixed 56
Merge branch 'feature/correct_main_page-51' into staging

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/web/shared/_partners.html.haml