Resolve "Overlay and annotation display"

Merged Piotr Gawron requested to merge 359-overlay-and-annotation-display into master

Closes #359 (closed)

Edited by Piotr Gawron

Merge request reports