Change Colorpicker

Change-Id: I79c7c2d63a5e2d2cab280ba2ca3564fdc742e08f

Conflicts:
	res/values/cr_strings.xml

Signed-off-by: siracuervo <fl.siracusa@outlook.com.ar>

Conflicts:
	res/layout/dialog_color_picker.xml
	res/values/cr_strings.xml