Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_package...

...s_apps_Settings into cm-11.0

Conflicts:
	res/values-pt/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values/cm_strings.xml