Build error : fixed

Conflicts:
	res/values/colors.xml