merge
Merge branch 'master' of
https://github.com/RodolpheFreby/LemmingsBornesArcades.git

Conflicts:
	src/jus/ricm/graphique/map_canvas.java