Fix #issue-999. Added created_by and last_edited_by fields to annotation texts
Updated fix for #issue-999 as per comments. Added internationalization, upload functionality, tests
Merge branch 'master' of https://github.com/MarkUsProject/Markus into issue-999
Merge branch 'issue-999'
Merge pull request #1209 from drunkel/issue-999

Closes #999. Added created_by and last_edited_by fields to annotation texts.