Debug
Merge remote-tracking branch 'origin/master' into debug

Conflicts:
	src/net/web2/TileView.java
Correction du main.xml
Débuggages divers...