bump up version to 2.1.0
Merge branch 'release/2.1.0' into develop
bump up version to 2.1.1 for development