Merge branch 'update_changelog' into 'master'
Update changelog & version number
See merge request hej/HEJ!275