Merge branch 'modules'

Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php

core/lib/Thelia/Controller/Front/BaseFrontController.php

@@ -25,6 +25,7 @@ namespace Thelia\Controller\Front;
 use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Thelia\Model\AddressQuery;
+use Thelia\Model\ConfigQuery;
 use Thelia\Model\ModuleQuery;
 use Thelia\Tools\URL;
 
@@ -83,4 +84,16 @@ class BaseFrontController extends BaseController
             $this->redirectToRoute("order.invoice");
         }
     }
+
+    /**
+     * @return ParserInterface instance parser
+     */
+    protected function getParser()
+    {
+        $parser = $this->container->get("thelia.parser");
+
+        $parser->setTemplate(ConfigQuery::getActiveTemplate());
+
+        return $parser;
+    }
 }