merge basic annotation panel features

(show the highlights ands tags in text and and clickable list in annotation panel)

Edited by Kristine Voigt