Changed version, added changelog, corrected tagging
Finished hotfix will now be merged into release, if there is one