Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock

Collection content source tab

Convert external source to entity

Display the entity type in MyDSpace

Header search box

Submit this collection

Fixed configuration-search-page fixedFilterQuery parameter

Fix history and bitstreamFormats store selector after moved in CoreState

Conflicts:
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/shared.module.ts

Reordering related entities in the submission

# Conflicts:
#	src/app/submission/submission.service.ts

Pagination on community page

Lookup relations - Search external sources

Upgrade Travis image to 'bionic'

remove chrome source, doesn't work anyway and doesn't seem to be needed. Remove chromium to try to solve the issue where travis can't find chrome

Fixed renamed TSLint rules

Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity

Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts

Upgrade angular 7