Merge branch 'master' of github.com:spatialdev/front-end-delivery

Conflicts:
	css/main.css
	css/modules/popup-info.scss
Merge branch 'master' of github.com:spatialdev/front-end-delivery

Conflicts:
	css/main.css