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

Conflicts:
	res/xml/button_settings.xml
	res/xml/quick_settings_panel_settings.xml
	res/xml/status_bar.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/ButtonSettings.java
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
	src/com/android/settings/cyanogenmod/QuickSettings.java
	src/com/android/settings/cyanogenmod/StatusBar.java