Endret på layout
Merge branch 'master' into layout_fix

Conflicts:
	app/views/hosts/_form.html.erb
Merge branch 'layout_fix'