Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts

Dynamic menus

Changed search filter cursor to pointer

DS249:  display subcommunities

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

issue 323 comcol page logo bottom padding

Conflicts:
	src/app/core/metadata/metadata.service.spec.ts

Conflicts:
	src/app/core/data/comcol-data.service.ts
	src/server.ts

fixed issue with hostwindowservice, search filter bug, changed sidebar toggle text to pin, fixed mobile view of header

Conflicts:
	webpack.config.js

Angular6 upgrade

Hide the wrapper component when there is no text content