Added ColorPicker. Rearranged controls in folders.
Merge remote-tracking branch 'thcristo/Branch4'