reorganize sass and css
Merge branch 'master' into gh-pages

* master:
  reorganize sass and css