Conflicts:
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.module.ts