Change color selector to color wheel
Merge branch 'master' into ui-improvements