make my life simpler
New superuser
Merge branch 'cm10.1' of https://github.com/Andromadus/android into phablet-10.1

Conflicts:
	default.xml