AAA
Merge branch 'test1' into test2

Conflicts:
	AndroidManifest.xml