Merge branch 'release/2.0'
[Android] Bumped version
Merge branch 'master' of github.com:usersource/anno into develop