Add all merged changes in the CHANGELOG file.
Merge branch 'master' of github.com:forkcms/forkcms