Changes by Franz.
Merge branch 'develop' of github.com:OS1web/os2web_core_theme into develop

Conflicts:
	css/global.css
	os2web_core_theme.info