Merge pull request #1212 from danielstjules/notes

Fix position of 'Note:' in the Notes edit page
Merge pull request #1209 from drunkel/issue-999

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