its on

Conflicts:

	res/values/colors.xml
	res/values/styles.xml