Mark annotations
Merge branch 'master' of https://github.com/albertjuhe/annotator_view