master branch focuses on 1.1 release
Fix for Issue 1202: missing user name in error message when trying to add inactive user to group
Fix for issue 1203: rubrics_controller now updates weights
Remove trailing whitespace and tabs
Fix #issue-999. Added created_by and last_edited_by fields to annotation texts
Merge pull request #1205 from danielstjules/issue-1202

Closes #1202: missing user name in error message when trying to add inactive user to group
Merge pull request #1206 from danielstjules/issue-1203

Closes #1203: rubrics_controller now updates weights
Merge pull request #1207 from danielstjules/trailing-whitespace

Remove trailing whitespace and tabs
Fixed positioning of the 'Delete annotation category' button
Fix position of 'Note:' in the Notes edit page
Fixing issue-717 and removing unnecessary pipe character from grader submission navigation bar
Merge pull request #1212 from danielstjules/notes

Fix position of 'Note:' in the Notes edit page
Merge pull request #1210 from danielstjules/annotations

Fixed positioning of the 'Delete annotation category' button
Merge pull request #1213 from wroy/issue-717

Fixing issue-717 and removing unnecessary pipe character from grader sub...
Merge pull request #1204 from benjaminvialle/Version

master branch focuses on 1.1 release
Fixed issue 1214. If instructor does not allow students to form own groups, instructor will not be warned about exceeding the group size limit
Merge pull request #1215 from daniyall/issue-1214

Fixed issue #1214. If instructor does not allow students to form own grou...
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.