Revert "Revert "Merge branch 'Uniformisation-de-la-BD'""

This reverts commit 6d3e03e389cb1b41f7c60ed3c786831cfa72f2c8.
Ajustement Merge