AnnotationView prototype.
Master update.
Fixing conflicts
Merge pull request #4 from guerre50/Victor-test

AnnotationView prototype.