Merge remote-tracking branch 'origin/dev' into test-dev

nginx/dev.conf

proxy.conf.json

src/app/app-routing.module.ts

src/app/app.component.html

src/app/app.component.ts

src/app/app.module.ts

src/app/footer/footer.component.scss

src/app/header/header.component.html

src/app/header/header.component.scss

src/app/home/home.component.html

src/app/home/home.component.scss

src/app/home/home.component.ts

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

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

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

src/app/services/geojson.service.ts

src/app/shared/components/button/button.component.html

src/app/shared/components/button/button.component.scss

src/app/shared/components/button/button.component.spec.ts

src/app/shared/components/button/button.component.ts