Sync from kraftal
Merge branch 'master' of https://github.com/Edicy/design-bern

Conflicts:
	components/html-head.tpl
	stylesheets/main.css