KML toGeoJson + Start Caching
Merge branch 'master' of https://github.com/OSMBuildings/Portal

Conflicts:
	client/osmb.html
	server/data/Barcelona.kml