Refactor annotation

Split annotation class to two parts: the annotation graphics scene item
and the annotation content which is part of the image. This disentangles
the UI from the model representation.
Show old annotation position until new takes effect