Merge pull request #133 from usersource/develop

sync with develop branch
Merge remote-tracking branch 'origin/develop' into feature/retry_on_server_error
Merge remote-tracking branch 'origin/develop' into feature/retry_on_server_error
[Anno App] retry on server error
Merge branch 'feature/retry_on_server_error' into develop