Settings Update
  * Give HALO and PIE Controls their own category
  * Volume rocker controls moved from lock screen to sound
  * Re-order settings layout

Conflicts:
	src/com/android/settings/SoundSettings.java

Change-Id: I6c3212ae3440693a6b31ec35e2f0319c7fbce0be
tabui crash fix, gaps & re-order

Change-Id: I6e577b5b4c5cdf4156a1aa95653dad22dfd66c97
Fix removal of backlight settings

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I118e667b306a5a1e50d593f3f18828b7a921a511
Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into staging

Conflicts:
	res/xml/lock_screen_settings.xml
	res/xml/settings_headers.xml

Change-Id: I434404396688f707eca9d7996b4428b831c90da0