Mac changes
Merge branch 'master' of https://github.com/schoenwaldnils/wp_theme_behr

Conflicts:
	styles/css/main.css
	styles/css/main.css.map
	styles/scss/_footer.scss
	styles/scss/_link.scss
	styles/scss/_nav.scss
	styles/scss/_thumbnail-banner.scss
	styles/scss/_variables.scss