Merge pull request #255 from kossebau/smallImprovementsForTests

Small improvements for tests
Add flag "showRemoveButton" to AnnotationViewManager, to not show the button if wanted