ajout de jonction
Merge branch 'master' of https://github.com/jpauger/TROYENS

Conflicts:
	Recyclapp/src/domaine/Station.java
	Recyclapp/src/recyclapp/gui/FenetrePrincipale.java
	Recyclapp/src/recyclapp/gui/PanneauPlanTravail.java