incrementing version to 2.5
Merge branch 'release-2.5'
Merge branch 'master' into develop
Incrementing version to 2.6-SNAPSHOT