Merge branch 'effet_cartes'

Conflicts:
	London/src/fr/m1miage/london/GestionErreurs.java
Merge branch 'master' into effet_cartes

Conflicts:
	London/src/fr/m1miage/london/GestionErreurs.java