changges from cs
Merge branch 'master' of https://github.com/bellcom/odsherred_intranet_theme

Conflicts:
	css/global.styles.css