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

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java