Merge branch 'master' into rob-branch

Conflicts:

wp-content/themes/gruen/.sass-cache/cd1e86f896d6a9e103afcd338e1bbff04c22
e00b/_homepage.scssc
	wp-content/themes/gruen/front-page.php
	wp-content/themes/gruen/sass/site/pages/_homepage.scss
	wp-content/themes/gruen/style.css