Merge branch 'gh-pages'
Add color classes for permanent-color
Merge branch 'master' into gh-pages