Merge pull request #2010 from ProjectMirador/2006-annos-from-otherContent

__tests__/fixtures/version-2/299843.json

__tests__/integration/mirador/annotations.test.js

__tests__/src/actions/annotation.test.js

__tests__/src/components/WindowViewer.test.js

__tests__/src/lib/ManifestoCanvas.test.js

__tests__/src/reducers/annotations.test.js

src/components/WindowViewer.js

src/containers/WindowViewer.js

src/lib/ManifestoCanvas.js

src/state/actions/action-types.js

src/state/actions/annotation.js

src/state/actions/index.js

src/state/reducers/annotations.js

src/state/reducers/index.js

src/state/reducers/rootReducer.js