Adding color Picker
Merge remote-tracking branch 'laptop/master'