Mise en place des factories
Merge branch 'mise_en_place_factories' into feature
Merge branch 'feature'