Gestions des combats
Merge branch 'master' into stab