Merge branch 'kitkat-remix' of github.com:AOSPAL/android_packages_apps_Settings into kitkat-remix

Conflicts:
	res/xml/additional_settings.xml