Merge branch 'cm-11.0' of https://www.github.com/CyanogenMod/android_packages_apps_Settings into HEAD

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