modified AndroidManifest.xml
Merge branch 'develop'