scss support in dev server
Merge branch 'master' into scss