add Superuser back

Conflicts:
	Android.mk
	proguard.flags

	modified:   Android.mk
	modified:   AndroidManifest.xml
	modified:   proguard.flags
restore superuser settings
	new file:   res/drawable-hdpi/ic_liquid_superuser.png
	new file:   res/drawable-xhdpi/ic_liquid_superuser.png
	modified:   res/values/liquid_strings.xml
	modified:   res/xml/settings_headers.xml

Conflicts:
	res/values/liquid_strings.xml
	res/xml/settings_headers.xml

	new file:   res/drawable-hdpi/ic_liquid_superuser.png
	new file:   res/drawable-xhdpi/ic_liquid_superuser.png
	modified:   res/values/liquid_strings.xml
	modified:   res/xml/settings_headers.xml
fix up last merge, start bringing back settings
	modified:   res/values/liquid_strings.xml