Added color pickers and color preview
Merge branch 'master' into gh-pages

* master:
  Added color pickers and color preview
updates from master