Merge 'origin/dev' into topic-search

.gitlab-ci.yml

Dockerfile

angular.json

nginx/dev.conf

package.json

src/app/app.module.ts

src/app/header/header.component.scss

src/app/home/home.component.html

src/app/home/home.component.ts

src/app/map/components/map.component.scss

src/app/map/components/map.component.ts

src/app/map/models/geoJsonProperties.model.ts

src/app/map/models/geojson.model.ts

src/app/map/services/map.service.ts

src/app/models/structure.model.ts

src/app/models/time.model.ts

src/app/models/week.model.ts

src/app/shared/components/index.ts

src/app/shared/components/logo-card/logo-card.component.html

src/app/shared/components/logo-card/logo-card.component.scss