Merge branch 'origin/master'

Conflicts:
	wp-content/themes/gbs/assets/sass/_main.scss
	wp-content/themes/gbs/module-stories.php
	wp-content/themes/gbs/module-violet-testimonials.php