Merge branch 'master' of https://github.com/makenet/Distanssi-theme

Conflicts:
header.php
index.php
Merge branch 'master' of https://github.com/makenet/Distanssi-theme

Conflicts:
	header.php
	index.php