commit du diable

mouahhaa
Merge remote-tracking branch 'origin/dev' into dev
merge constants

merge constants