Fix blank display of annotation data as html on Linux

This fixes WS-139 "[Linux] Note text is not displayed".  The old
code worked fine on Windows, but displayed nothing on Linux.  The
new code works on both platforms.
Merge pull request #20 from sillsdev/Fix-WS-139

Fix blank display of annotation data as html on Linux
Fix the display of merge conflict details

This was broken on both Linux and Windows by the fix for WS-139 (which
deleted too much code), and was already broken on Linux in the same way
as WS-139.
Merge pull request #21 from sillsdev/FixMergeConflictDisplay

Fix the display of merge conflict details