Merge branch 'annotation-on-video'

__tests__/integration/mirador/video_preloaded.test.js

__tests__/src/components/VideoViewer.test.js

babel.config.js

jest-puppeteer.config.js

jest.json

package-lock.json

package.json

setup-expect-timeout.js

src/components/AnnotationSettings.js

src/components/AnnotationsOverlayVideo.js

src/components/CanvasAnnotations.js

src/components/VideoViewer.js

src/components/ViewerNavigation.js

src/components/ViewerNavigationVideo.js

src/components/WindowCanvasNavigationControlsVideo.js

src/config/settings.js

src/containers/AnnotationSettings.js

src/containers/AnnotationsOverlayVideo.js

src/containers/CanvasAnnotations.js

src/containers/VideoViewer.js