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

Entities grid templates

Collection pages, recent submissions: Added "empty" message

Bitstream format registries

Fix the labels on edit collection and community pages

Pagination messaging:  Hiding "Now Showing"

Modeled on browse-by.component.html

Change padding into margin
Change 'Create link' to a button
Add placeholder to extension field
Fix pagination

 Conflicts:
	resources/i18n/en.json

Configuration search page component

Edit current item query

Flatten i18n files

Remove e2e tests from the ci task

 Conflicts:
	src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
	src/app/core/core.module.ts
	src/app/core/registry/registry-bitstreamformats-response.model.ts
	src/app/core/registry/registry.service.ts
	src/app/core/shared/bitstream-format.model.ts

Upgrade dependencies to prevent vulnerabilities

upgrade dependencies to prevent CVE-2019-10744, CVE-2019-13173, CVE-2018-14732, CVE-2018-16469, CVE-2018-1000620, CVE-2019-10744 and WS-2018-0236