Rearange the changelog
Merge pull request #1022 from camptocamp/changelog

Rearange the changelog