fix derp

Conflicts:
	AndroidManifest.xml