Deplacement des marchants
Merge branch 'dev_bilou' into server_test