Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration

diff --cc erp24/media/config/media.config.php
index a0df36c0e879dd6740598119da8b3c59025ae749,836526228739d918c96c6de541c61f310fb857a1..8d8662719347ef90fde0d8d66033d4b3d116ab69
--- 1/erp24/media/config/media.config.php
--- 2/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@@ -25,8 -25,9 +25,9 @@@ return 
              'enableStrictParsing' => false,
              'showScriptName' => false,
              'rules' => [
 +                'GET media/view-image/<id:\d+>' => 'media/view-image'
+                 'flowwow/feed/<id:\d+>' => 'flowwow/feed',
              ],
 -
          ],
          'request' => [
              'scriptUrl' => '/',