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
Moved grades.js. Fixed issue-1224
Merge branch 'issue-1224'

Fix issue-1224.
Fix for issue 54, increased gap between buttons on calendar date select and increased font size
Fix for issue 54, fixed text for Today button. Refactored some code
Merge pull request #1226 from daniyall/issue-54

Closes #54 - Increased the gap between buttons in calender_date_select and increased font size for buttons.
Merge pull request #1225 from ariannedee/master

Closes #1224 - Upload grade entry form grades by CSV link doesn't work anymore
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.