tpl part
Merge branch 'master' of github.com:Sydsvenskan/insidan

Conflicts:
	header.php
fixed