Oops starting the smoke at the wrong place.
Merge branch 'edge' of github.com:bumblebeefr/osm-tchoutchou into edge

Conflicts:
	static/raildar/models/Trajet.js