Conflicts:
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/active-router-stub.ts

Conflicts:
	src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html

Conflicts:
	src/app/core/data/item-data.service.ts

Conflicts:
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/shared/operators.ts

Merge branch 'resolvers-branch-angular6' of https://git.atmire.com/contributions/dspace-angular into patch-support

Conflicts:
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/shared/loading/loading.component.ts
	yarn.lock

Conflicts:
	src/app/app.module.ts

Issue 313: add support for paginated properties on dspace objects

Issue 311: No files item page bugfix

#293 Added link with the query quoted for search results if empty