CCC
Merge branch 'test2' into test1

Conflicts:
	AndroidManifest.xml