V1.1
Merge branch 'Axel' of https://github.com/EatZeBaby/PROJET_SAR_2013_2014 into Axel

Conflicts:
	Affichage.java
	Bus.java
	GestiBus.java
	Ligne.java
	classes/Bus.class
	classes/Controleur.class
	classes/Database.class
	classes/GestiBus.class
	classes/Ligne.class
	classes/ThreadClient.class