Improvements and fixes for annotator.
Merge branch 'master' of git@github.com:substance/document.git
Integration of annotator.