Escaped any html within annotations as a security measure.
Merge branch 'biocat-master' into biovel-master