maj
Merge branch 'master' of https://github.com/agauthier-cstj/Combaxe

Conflicts:
	Combaxe - Solution/Combaxe/Écrans/EcranCombat.xaml.cs