change 8 -> 10

somehow to trigger the conflict
Merge branch 'master' into feature2

Conflicts:
	AndroidManifest.xml