Add color picker

Conflicts:

	res/layout/pick_item.xml
	res/values/strings.xml