Merge branch 'develop'

ShopBundle/Controller/Backend/NewsController.php

@@ -62,6 +62,7 @@ class NewsController extends AdminController
         public function sendAction()
         {
                 ini_set('memory_limit', '-1');
+                set_time_limit(0);
 
                 $currentMerchant = $this->merchantUtils->getMerchantCurrent() ;
                 $newsletter = $this->getNewsletter() ;