Fix build

Conflicts:

	res/values/colors.xml