incrementing version to 2.4
Merge branch 'release-2.4'
Merge branch 'master' into develop
updating to dev version 2.5-SNAPSHOT