Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_packages_apps_Settings into kitkat-legacy-staging

Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	res/values/themes.xml
	res/xml/development_prefs.xml