Merge branch 'hotfix/fix_versions' into develop
Merge branch 'master' into develop
updated wrapper
renamed jar
Merge branch 'feature/update_wrapper' into develop
version codes
Merge branch 'release/r2'