PIE from ParanoidAndroid [2/2]

Conflicts:
	AndroidManifest.xml
	res/values/mahdi_arrays.xml
	res/values/mahdi_strings.xml