incrementing to version 2.0
Merge branch 'release-2.0'
Merge branch 'master' into develop
incrementing to development version 2.1-SNAPSHOT