Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Fixed issue #1376, will now give user warnings when they upload a non .csv file or no file
Added functional tests for this issue.
Added tests for #1376 and a file needed for the tests.
Merge pull request #1381 from davidrd/issue-1376

Closes #1376 - Created by, Last edited by aren't set when annotation is created in grading view