Halo
Merge branch 'halo' of https://github.com/IOKP/packages_apps_Settings into halo

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/halo_settings.xml
HALO Building 1