Settings Modification Part 2
Merge branch 'kk-4.4' of git://github.com/PSX-PureSpeed/android_packages_apps_Settings into HEAD

Conflicts:
	res/xml/security_settings_chooser.xml