Commit
Merge
Added color picker