Merge branch 'master' of github.com:spotify/backstage into blam/react-router

* 'master' of github.com:spotify/backstage: (45 commits)
  chore(catalog): simplify the filter types a little
  fix(catalog-backend): update the mock-data script to point to new example entities
  renamed example_components to example-components and deleted old exampled
  feat(catalog): add back ability for OR/IN type searches
  Add sample plugins to sidebar (#1243)
  chore(catalog): rename all pages and components to use Entity nomenclature
  fix(catalog): moar clean up
  Updated examples
  fix(catalog): add types and clean up code
  Added owner and lifecycle to catalog table, slightly updated examples
  chore(catalog): the component type is gone
  yarn.lock again...
  fix(catalog): merge errors
  review fixes. i thought about another force update for a moment :D
  move components to separate files
  fix(catalog): moar clean up
  fix(catalog): make code intention clear by renaming
  Merge pull request #1214 from spotify/feat/star-components
  Merge pull request #1194 from spotify/freben/backend-common-service
  Merge pull request #1215 from spotify/mob/sidebar-auth
  ...

plugins/circleci/src/components/Layout/Layout.tsx

@@ -15,20 +15,12 @@
  */
 import React from 'react';
 import { Header, Page, pageTheme, HeaderLabel } from '@backstage/core';
-import { Box } from '@material-ui/core';
 
 export const Layout: React.FC = ({ children }) => {
   return (
     <Page theme={pageTheme.tool}>
-      <Header
-        pageTitleOverride="Circle CI"
-        title={
-          <Box display="flex" alignItems="center">
-            <Box mr={1} /> Circle CI
-          </Box>
-        }
-      >
-        <HeaderLabel label="Owner" value="Team X" />
+      <Header title="CircleCI" subtitle="See recent builds and their status">
+        <HeaderLabel label="Owner" value="Spotify" />
         <HeaderLabel label="Lifecycle" value="Alpha" />
       </Header>
       {children}