Merge branch 'master' into color-wheel
color wheels functional on edit article page
Merge branch 'master' into color-wheel
Merge pull request #28 from alangster/color-wheel

Color wheel