Merge branch 'dev' into dev-max
modiftest
Merge branch 'dev-max' into dev

Conflicts:
	.DS_Store
merge ok
Merge branch 'dev' into dev-max
BASE SURE
Merge branch 'dev-max' into dev
edit .gitignore
BundleNotation

Génération des entités + CRUD
Merge branch 'dev' into dev-magre