turn debug info off
recompile sass
Merge branch 'refs/heads/master' into test

Conflicts:
	themes/diversity/css/global.styles.css
	themes/diversity/sass/global.styles.scss