Proper packages names
There's no need to put my nick in the packages. Better name them 'hybrid'

Change-Id: I0386352f34725ba2b5c2b1b85b4d565fb808b08f
Merge branch 'cm-10.1' of https://github.com/BeerGang/android_packages_apps_Settings into HEAD

Conflicts:
	AndroidManifest.xml

Change-Id: I0e843a7e06b1f767f76b732d12265135666470d4