handle enter key in colorpicker textbox
Merge branch 'master' into colors