Beta testing apk ready
Merge branch 'master' into refactor