bumping to version 2.3
Merge branch 'release-2.3'
Merge branch 'master' into develop
incrementing to dev version 2.4-SNAPSHOT