Merge commit 'refs/pull/5/head' of https://github.com/magento/magento2ce into MAGETWO-36002-Responsive-Email-Template-PR

Author: Ji Lu

app/code/Magento/Email/Model/BackendTemplate.php

@@ -38,8 +38,8 @@ class BackendTemplate extends Template
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
         \Magento\Framework\View\DesignInterface $design,
+        \Magento\Framework\Registry $registry,
         \Magento\Store\Model\App\Emulation $appEmulation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Asset\Repository $assetRepo,