Merge branch 'master' into mm-mainpageMargins

Conflicts:
	app/assets/stylesheets/_common.scss