Early templates
Merge branch 'master' into templates/templates

Conflicts:
	source/css/style.css.map
Social links on various templates (in shame file)