Merge branch 'release/2.4.0' into develop
Bumped versions
Included hotfix into develop
Added version to footer
Added last merge info to changelog
Bumped version numbers
Merge branch 'release/2.5.0'