Exported fixed APK
Merge branch 'master' into development