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
Issue-1194: almost finished. Position added to grade_entry_items and being updated properly from manual creation. CSV upload works but needs more testing and maybe different functionality.
Merged grade_entry_forms to handle error conversion to string
Fixed updating position for manual entry and for utf-8 csv upload. Updated tests but some still not working.
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'
Fixed failing unit tests and added tests for updating invalid out_of and duplicate names
Merge pull request #1209 from drunkel/issue-999

Closes #999. Added created_by and last_edited_by fields to annotation texts.
Finished updating grade_entry_item_test.
Fixed 1 test error and 1 failing test. Added 1 test and 4 test stubs for new csv upload functionality
Finished grade_entry_form csv upload tests

Reverted old ISO-8859-1 test file to previous version.
Added more tests to show that uploading an already existing column
should update old column and uploading a new column will add the new
column and delete any old columns/grades associated with the form
before.
Changed how positions are being updated. Much better than the last version. Updated tests
Added tests for updating positions on new and update