Including Color Picker
Merge pull request #2 from shaheen-shafi/master

Including Color Picker