Add Device Settings Into Display Settings

Conflicts:
	DeviceSettings/src/com/cyanogenmod/settings/device/DisplaySettings.java
	DeviceSettings/src/com/cyanogenmod/settings/device/SensorsFragmentActivity.java
	DeviceSettings/src/com/cyanogenmod/settings/device/mDNIeMode.java
Fix DeviceSettings name for all languages

Conflicts:
	DeviceSettings/res/values-de/strings.xml
	DeviceSettings/res/values-fi/strings.xml
	DeviceSettings/res/values-hu/strings.xml