добавлен basemapToggle
Merge branch 'basemap-toggle' into zemlya

Conflicts:
	public/css/custom.css
Merge branch 'zemlya' into intersect