Setup new style theme
Setup new style theme
Merge remote-tracking branch 'origin/master' into paul

Conflicts:
	wp-content/themes/welovefalafel/build/css/wp-editor-style.css
	wp-content/themes/welovefalafel/build/css/wp-editor-style.css.map
	wp-content/themes/welovefalafel/build/js/scripts.js
	wp-content/themes/welovefalafel/build/js/scripts.min.js
	wp-content/themes/welovefalafel/build/scss/_base.scss
	wp-content/themes/welovefalafel/build/scss/_content.scss
	wp-content/themes/welovefalafel/build/scss/_footer.scss
	wp-content/themes/welovefalafel/build/scss/_header.scss
	wp-content/themes/welovefalafel/build/scss/_navigation.scss
	wp-content/themes/welovefalafel/build/scss/_post-formats.scss
	wp-content/themes/welovefalafel/build/scss/_wp-base.scss
	wp-content/themes/welovefalafel/build/scss/style.scss
	wp-content/themes/welovefalafel/build/style.css
	wp-content/themes/welovefalafel/build/style.css.map