Merge branch 'master'

Feature #13753

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index 912ab87fd9a63300419e82d3af894b6a890656b3,f3ad839d3502b2102e6225c057a1b51e8c7021f7..80a85f1aef51a7ed5e3e323a7f985e4fb650a9bd
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -32,7 -32,7 +32,8 @@@ import { sidePanelData, SidePanelIdenti
  import { ProjectResource } from '../../models/project';
  import { ResourceKind } from '../../models/resource';
  import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
 +import { FavoritePanel } from "../favorite-panel/favorite-panel";
+ import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
  
  const drawerWidth = 240;
  const appBarHeight = 100;