itinéraire bus
Merge origin/master

Conflicts:
	toolkit/Toolkit.php
Merge origin/master

Conflicts:
	toolkit/Toolkit.php