# Conflicts:
#	package.json
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/core/cache/request-cache.reducer.spec.ts
#	src/app/core/cache/request-cache.service.spec.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts

upgraded to ngx-translate

Initial home page content

Simple Item View Page

Add support for Communities

Rest relationships

Merge branch 'rest-relationships' of https://github.com/artlowel/dspace-angular into w2p-40416_simple-item-page

Conflicts:
	src/app/core/cache/models/normalized-item.model.ts
	src/app/core/shared/item.model.ts

moved reflect-metadata from devDependencies to dependencies in order to try and fix a travis build issue

Conflicts:
	src/app/core/cache/models/bundle-builder.ts
	src/app/core/cache/models/collection-builder.ts
	src/app/core/cache/models/item-builder.ts

Conflicts:
	src/app/core/shared/dspace-object.model.ts