Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit cefe03e088a9a60f2713cbb753b1586d7ece7784)

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/LockscreenButtons.java
Merge branch 'cm-11.0' of https://github.com/096-NET-UKRAINE/android_packages_apps_Settings into cm-11.0