Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Traduction des enums et de certaines tables
Merge branch 'master' into develop