Update to latest commits

See
https://github.com/VanirAOSP/platform_packages_apps_Settings/commits/jb4
3/res/values
Merge branch 'master' of https://github.com/BobQuentok/VanirAOSP-German

Conflicts:
	res/values-de/strings.xml