coin coin apocalyptique
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/arbitre/ArbitreLocal.java
	Manhattan/src/graphique/AnimationReflexion.java
	Manhattan/src/graphique/TerrainGraphique.java
	Manhattan/src/gui/GuiRev1.java
	Manhattan/src/types/JobGui.java