superuser

Change-Id: Idef89369f650116c20bd69e76bb0e6394ed99e8c
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android into jb-mv

Conflicts:
	default.xml

Change-Id: I38f0ecfea9944d6a245eb33db8e41b184f8dadc5