image annotations back
Merge branch 'master' into fix-image-annotations
added html annotations