update androidmanifest test
Merge branch 'master' of https://github.com/batmaster/MPOS

Conflicts:
	AndroidManifest.xml