wfs 2.0.0
Merge branch 'master' of https://github.com/OSMBuildings/Portal

Conflicts:
	server/convert.js