Petites simplifications dans le code
Merge remote-tracking branch 'origin/master' into masterFinal
Merge remote-tracking branch 'origin/masterFinal' into masterFinal
test branch