Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/ButtonSettings.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java