Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/scss/style.scss
	front-page.php
	header.php
	home.php
	style.css
	style.css.map