server reorg
server reorg
Merge branch 'master' of https://github.com/OSMBuildings/Portal

Conflicts:
	server/server.js
xml reader updated