cleanup strings YIPPIEYEAH

Change-Id: I8ce69b159bd63c3b4b220e1abc2c7b7a48f6c0a9
Revert "cleanup strings YIPPIEYEAH" by accident pushed to head

This reverts commit 10530c62083cf35529f024fc808e3f535d7a6e0f.
Settings restructuring/reorganization

In the wake of kufikugel's incredible work optimizing and consolidating our
framework backend, as well as redundant settings screens (Sound/Display/etc),
this is a follow-up to better organize features into more intuitive and AOSP-like screens.

In addition to our old Interface settings, we've added General, Navigation and
Advanced options.

Less consistently used CM-features such as Quiet Hours, Profiles and Themes have
been moved to Sound, General and Interface respectively.

More advanced features such as Superuser, Performance and DeviceSettings are now
in Advanced options, below Developer options.

Change-Id: I85c8756e2b3af816b74703a3b790828fc68c42aa
Merge "Settings restructuring/reorganization" into jb4.2
Merge remote-tracking branch 'slim/jb4.2' into kang

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml
	res/xml/slim_navigation_settings.xml
	src/com/android/settings/Settings.java