Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/cmx_arrays.xml
	res/values/cmx_strings.xml
	res/xml/settings_headers.xml