Halo 2.0 (step 2/2)

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml