Merge back and forth the changes on the document viewer 1.2.5 maintenance and the trunk
We have a maintenance branch of the document viewer 1.2.5. We should merge back en forth the changes to ensure that both codebase only changes by the version of the model, extended, annotator, content manager and structured document renderer used inside