Merge branch 'master' into develop
factor more out of main.scss