Merge branch 'develop'

Factory/Address/AddressFactory.php

@@ -15,9 +15,6 @@ class AddressFactory extends AbstractFactory
         $class = AddressContainer::getEntityFqcn();
         $address = new $class;
 
-        $address->setMerchant($merchant);
-
         return $address;
     }
-
 }

Resources/views/admin/user/field/newsletters.html.twig

@@ -0,0 +1,5 @@
+{% if entity.instance.getNewsletters()|length %}
+    <span class="badge badge-success">Oui</span>
+{% else %}
+    <span class="badge badge-secondary">Non</span>
+{% endif %}