Merge remote-tracking branch 'upstream/master' into configurable_entities

package.json

resources/i18n/en.json

src/app/+admin/admin-sidebar/admin-sidebar.component.spec.ts

src/app/+admin/admin-sidebar/admin-sidebar.component.ts

src/app/+admin/admin.module.ts

src/app/+collection-page/collection-page-routing.module.ts

src/app/+community-page/community-page-routing.module.ts

src/app/+search-page/search-page.module.ts

src/app/+search-page/search-service/search.service.ts

src/app/app-routing.module.ts

src/app/core/cache/builders/remote-data-build.service.ts

src/app/core/cache/object-cache.service.spec.ts

src/app/core/cache/object-cache.service.ts

src/app/core/cache/server-sync-buffer.effects.spec.ts

src/app/core/cache/server-sync-buffer.effects.ts

src/app/core/core.module.ts

src/app/core/data/comcol-data.service.spec.ts

src/app/core/data/comcol-data.service.ts

src/app/core/data/data.service.spec.ts

src/app/core/data/data.service.ts