Merge branch 'annotation-on-video' into 17-8-open-an-other-manifest-side-by-side-from-an-annotation

# Conflicts:
#	package.json

__tests__/src/components/WindowTopMenu.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Menu from '@material-ui/core/Menu';
 import WindowThumbnailSettings from '../../../src/containers/WindowThumbnailSettings';

__tests__/src/components/WindowTopMenuButton.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import WindowTopMenu from '../../../src/containers/WindowTopMenu';
 import { WindowTopMenuButton } from '../../../src/components/WindowTopMenuButton';

__tests__/src/components/WindowViewSettings.test.js

-import React from 'react';
 import { mount } from 'enzyme';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
 import ListSubheader from '@material-ui/core/ListSubheader';

__tests__/src/components/WindowViewer.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import { WindowViewer } from '../../../src/components/WindowViewer';
 import WindowCanvasNavigationControls from '../../../src/containers/WindowCanvasNavigationControls';

__tests__/src/components/Workspace.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Typography from '@material-ui/core/Typography';
 import WorkspaceMosaic from '../../../src/containers/WorkspaceMosaic';

__tests__/src/components/WorkspaceAdd.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import AppBar from '@material-ui/core/AppBar';
 import Drawer from '@material-ui/core/Drawer';

__tests__/src/components/WorkspaceAddButton.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Fab from '@material-ui/core/Fab';
 import Typography from '@material-ui/core/Typography';

__tests__/src/components/WorkspaceArea.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import WorkspaceControlPanel from '../../../src/containers/WorkspaceControlPanel';
 import Workspace from '../../../src/containers/Workspace';

__tests__/src/components/WorkspaceControlPanel.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import AppBar from '@material-ui/core/AppBar';
 import createStore from '../../../src/state/createStore';

__tests__/src/components/WorkspaceControlPanelButtons.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import WorkspaceMenuButton from '../../../src/containers/WorkspaceMenuButton';
 import FullScreenButton from '../../../src/containers/FullScreenButton';

__tests__/src/components/WorkspaceElastic.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import { Rnd } from 'react-rnd';
 import ResizeObserver from 'react-resize-observer';

__tests__/src/components/WorkspaceElasticWindow.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import { Rnd } from 'react-rnd';
 import WorkspaceElasticWindow from '../../../src/components/WorkspaceElasticWindow';

__tests__/src/components/WorkspaceExport.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Dialog from '@material-ui/core/Dialog';
 import Button from '@material-ui/core/Button';

__tests__/src/components/WorkspaceImport.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Dialog from '@material-ui/core/Dialog';
 import TextField from '@material-ui/core/TextField';

__tests__/src/components/WorkspaceMenu.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Menu from '@material-ui/core/Menu';
 import MenuItem from '@material-ui/core/MenuItem';

__tests__/src/components/WorkspaceMenuButton.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import MiradorMenuButton from '../../../src/containers/MiradorMenuButton';
 import { WorkspaceMenuButton } from '../../../src/components/WorkspaceMenuButton';

__tests__/src/components/WorkspaceMosaic.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import { MosaicWithoutDragDropContext } from 'react-mosaic-component';
 import MosaicRenderPreview from '../../../src/containers/MosaicRenderPreview';

__tests__/src/components/WorkspaceOptionsButton.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import MiradorMenuButton from '../../../src/containers/MiradorMenuButton';
 import WorkspaceOptionsMenu from '../../../src/containers/WorkspaceOptionsMenu';

__tests__/src/components/WorkspaceOptionsMenu.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import MenuItem from '@material-ui/core/MenuItem';
 import WorkspaceExport from '../../../src/containers/WorkspaceExport';

__tests__/src/components/WorkspaceSelectionDialog.test.js

-import React from 'react';
 import { shallow } from 'enzyme';
 import Dialog from '@material-ui/core/Dialog';
 import MenuItem from '@material-ui/core/MenuItem';