Merge branch 'master' into dev
update csscomb.js and clean up the stylesheets
Merge branch 'dev'