Added Branch fix20
Added comment 12
Added hot fix comment 12
Merge branch 'fix21'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
changed AndroidManifest.xml