master branch focuses on 1.1 release
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