Handle storage history delete and restore annotations
Merge branch 'master' of github.com:eea/annotator