interim commit, working towards mockup implementation
interim commit working to implement mockup
adds further work on home page template
Merge branch 'master' into frontpage

Conflicts:
	themes/snap/logo.png
	themes/snap/sass/_init.scss
	themes/snap/sass/_mixins.scss
	themes/snap/sass/_snap.scss
move js to template