add color choose
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/canvas_activity.xml