Fix home page feature broken by 4569a4
Merge branch 'master' into styleguide_appearance

Conflicts:
	config/locales/en.yml