Merge branch 'master' into dev
removed SCSS comments

Forgot to set the CSS output to production mode. Sorry!
Merge branch 'dev'