Update README.md
Update CHANGELOG.md
grouping geometry types
enabling cones
Merge branch 'master' into geometry
Merge branch 'master' into roofs

Conflicts:
	dist/OSMBuildings-Leaflet.debug.js
	dist/OSMBuildings-Leaflet.js
	dist/OSMBuildings-OpenLayers.debug.js
	dist/OSMBuildings-OpenLayers.js
	src/import/OSMXAPI.js
preparing more geometry types
height scale fix
cleanup
finding good ratio WIP
unified geom handling for cylinder, cone, dome
allowing various OSM tags as GeoJSON properties
cylinder flickering fixed
few more simplifications for object import
fixed simplicity check for domes
Merge branch 'master' into fov
adjusting height scale - ignoring vfov
new build
Merge branch 'master' into roofs

Conflicts:
	dist/OSMBuildings-Leaflet.debug.js
	dist/OSMBuildings-Leaflet.js
	dist/OSMBuildings-OpenLayers.debug.js
	dist/OSMBuildings-OpenLayers.js
	src/Import.js
	src/import/OSMXAPI.js
outstanding merges