Ny frontend kode til admin bliver inc i footer.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/catalog/_home_text.html.erb