Merge pull request #1409 from gillianchesnais/issue-1340

Closes #1340: Viewing a file interprets <> as tag characters
Updated Changelog
Merge pull request #1410 from Gerb11/master

Closes #1402: UI Alignment error when sorting