start implementing styles for non-frontpage template
Merge branch 'master' into non-frontpage

Conflicts:
	themes/snap/sass/_snap_header.scss