Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Combaxe - Solution/Combaxe/classes/services/PersonnageService.cs
Merge branch 'master' of https://github.com/agauthier-cstj/Combaxe