Fix viewlet within edit mode
Merge branch 'master' of https://github.com/collective/eea.annotator