sync
Merge branch 'master' of https://github.com/ruskam/GreenRoofMapping

Conflicts:
	web/js/map.js