edit_map
Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	GameMenu/GameMenu/GameMenu/Umea-rana.csproj.Debug.cachefile
editeur de map pla