Merge branch 'develop'

ShopBundle/Controller/Backend/NewsController.php

                                     'Email' => $this->getParameter('app.noreply_email'),
                                     'Name' => $this->getParameter('app.site_name')
                                 ],
-                                'Subject' => $currentMerchant->getMerchantConfig('email-subject-prefix').' '.$news->getTitle(),
+                                'Subject' => $currentMerchant->getMerchantConfig('email-from-name').' - '.$news->getTitle(),
                                 'TextPart' => $this->renderView('mail/news-text.html.twig', $paramsTemplate),
                                 'HTMLPart' => $this->renderView('mail/news-html.html.twig', $paramsTemplate),
                                 'CustomCampaign' => $news->getTitle(),

ShopBundle/Services/Order/OrderUtilsReductionTrait.php

                                 $this->utils->addFlash('error', 'error.reductionCredit.alreadyUse');
                                 return false;
                         }
-
                 }
 
                 return true;