Draft support for annotation editing and highlight-mode switching

 * Annotation currently being edited are added to the drafts
 * AppController.toggleHighlightingMode() checks for drafts before continuing
 * Fixes #628