minor update

Conflicts:
	AndroidManifest.xml