I cant remember what I changed
Merge branch 'master' of https://github.com/CMBQ/packages_apps_Settings

Conflicts:
	res/values/cm_strings.xml