Merge remote-tracking branch 'origin/feature_fomichev_erp_149_flowwow_feed' into...

# Conflicts:
#	erp24/api2/controllers/FlowwowController.php

diff --cc erp24/api2/controllers/FlowwowController.php
index cdcd10472333702f3c272c1e97c5ba83cd8d1056,3eb8a582514fe19c2e33f7c4d4325ce5ab858cbe..788ee1f69e0fbc71ba3e8b987becf36f0580b90c
--- 1/erp24/api2/controllers/FlowwowController.php
--- 2/erp24/api2/controllers/FlowwowController.php
+++ b/erp24/api2/controllers/FlowwowController.php
@@@ -17,6 -17,7 +17,8 @@@ class FlowwowController extends Control
  
          $productsInfo = MarketplaceService::getAllProductsInfo($id);
  
+ 
++
          $xmlFeed = MarketplaceService::createXMLFeed($productsInfo);
  
          // Устанавливаем заголовок, чтобы отдать XML