renamed androd apk package name
Merge branch 'master' into production