Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php
	styles/css/main.css
	styles/css/main.css.map
	styles/scss/_banner.scss
	styles/scss/_colors.scss
	styles/scss/_nav.scss
	styles/scss/bootstrap/_variables.css