Fixed positioning of the 'Delete annotation category' button
Fix position of 'Note:' in the Notes edit page
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 branch 'master' of github.com:benjaminvialle/Markus into machinist2