Merge pull request #24 from CptPilou/master

 	Optimisation de l'interdiction de télépéage pour les camions
Corrections GUI
Merge pull request #25 from Warrows/master

Corrections GUI
Bouton nbr alarmes
Merge branch 'master' of https://github.com/quentinRi/TollBarrier.git

Conflicts:
	src/tollBarrier/gui/InterfaceGraphique.java