Halo Circle Color (2/2)

Conflicts:

	res/values/pa_strings.xml