Merge branch 'julian' + correction bug mineurs
COMMIT