Merge ui/master
Fix de Partie.java
Merge branch 'master' of https://github.com/Aethia/LONDON

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