Gestion du nombre de type de persone sur le terrain
Merge branch 'dev' of https://github.com/remeh/soulkeeper into dev

Conflicts:
	mini_menu.lua