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