Added a color preview square to the colorpicker.
Merge pull request #1659 from flukeout/colorpicker

Added a color preview square to the colorpicker.