Fix changelog merging + fix AddToChangelog.exe

The changelog now uses union merges to reduce conflicts.
Changed the EOLs in changelog.html to CRLF to be standardized for AddToChangelog.exe.

AddToChangelog.exe was using a mix of \r\n and \n EOLs, fully uses \r\n now.