Settings : Re-organize menu structure

Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0

Conflicts:
	AndroidManifest.xml
	res/values-el/cm_strings.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