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

Conflicts:
	res/layout-land/lockscreen_targets.xml
	res/layout/lockscreen_targets.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/power_menu_settings.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/cyanogenmod/PowerMenu.java