Merging

BEGINRELEASENOTES

• CHANGELOG

CHANGE: Move CHANGELOG to folder and create changelog per version

ENDRELEASENOTES

There is one more PR to devel where the same is done. The automation is easier and you can see better cross reference version. The devel will not include statements like "includes all patches up to including v10r0p8"

Added also git attributes for merge drivers, which mean that if you include the driver

git config --global merge.ours.driver true

when you merge master to devel these files in the .gitattributes will be ignored