Updated version to 2.5
Merge branch 'release/2.5' into develop