conflict
Merge branch 'gh-pages' of https://github.com/clement-lagrange/osmtools-indoor into gh-pages

Conflicts:
	js/building.js
	js/leaflet/leaflet.hash.js
	js/overpass.js
	js/start.js