Merge branch 'master' into 460-coll-pages

.travis.yml

README.md

docker/README.md

docker/cli.assetstore.yml

docker/cli.ingest.yml

docker/cli.yml

docker/db.entities.yml

docker/docker-compose-rest.yml

docker/docker-compose-travis.yml

docker/docker-compose.yml

docker/environment.dev.js

docker/local.cfg

...elationship-list/edit-relationship-list.component.spec.ts

...ips/edit-relationship/edit-relationship.component.spec.ts

...e/item-relationships/item-relationships.component.spec.ts

...page/simple/item-types/shared/item-relationships-utils.ts

.../cache/models/items/normalized-relationship-type.model.ts

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

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

...core/shared/item-relationships/relationship-type.model.ts