Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Merge branch 'cm-10.1' of https://github.com/shumashv1/android_packages_apps_Settings into cm-10.1
Revert "Halo: Add master switch to disable Halo (2/2)"

This reverts commit 88402a5c8defbee9b4a4c26ef4106f9e66bc16d8.

Change-Id: If492d6005a4b1ed05ff182a35d9e0fe7ba775dc8

Conflicts:

	res/values/strings.xml
	src/com/android/settings/paranoid/Halo.java