360 cross format annotations

Here are the changes to integrate cross-format-annotation work done in annotator and annotator-store into h. I merged latest changes from develop before sending this pull request. Hopefully it won't be too much trouble.