Merge branch 'jellybean' of github.com:Matricom/packages_apps_Settings into jellybean