AndroidMenifest.xml update test2
Merge branch 'master' of https://github.com/bluesh55/YB

Conflicts:
	AndroidManifest.xml