Merge branch 'hotfix'
Added sprint-2 hotfix-1 apk
Merge branch 'master' into develop