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

Conflicts:
	GameMenu/GameMenu/GameMenu/Editeur de map/UserControl2.designer.cs
temp