Added tags to annotations sidebar
Merge branch 'master' into issue66