Merge branch 'release' into develop
Built working apk
Merge branch 'hotfix'