Update CHANGELOG.md
Merge branch 'feature/2_x_changelog' into develop