Started work for color picker
Cleanup of code
fixed conflicts
tmp
Color picker implemented
Added rollover states to ColorPicker and fixed hitboxes
Merge