divers paufinage
Merge branch 'master' of https://github.com/cybil/IntervenSim

Conflicts:
	View/MapPanel.java