add color picker
Merge remote-tracking branch 'origin/addGCM' into addGCM

Conflicts:
	.idea/libraries/support_annotations_21_0_0.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	widget/widget.iml
add color picker