update entities
clean entities
clean entities
generate entities
Merge branch 'devBDD' into dev
generate entities 2
clean entities 2
clean entities 2
generates entities 3
generates entities 3
merge de la bdd
fix conflit