Merge branch 'master' into brands

Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -1165,7 +1165,7 @@
     </route>
 
     <route id="export.customer.newsletter" path="/admin/export/customer/newsletter">
-        <default key="_controller">Thelia\Controller\Admin\CustomerExportController::NewsletterExportAction</default>
+        <default key="_controller">Thelia\Controller\Admin\CustomerExportController::newsletterExportAction</default>
     </route>
 
 

core/lib/Thelia/Config/Resources/test.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<config xmlns="http://thelia.net/schema/dic/config"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
+
+    <parameters>
+        <parameter key="test.client.class">Thelia\Core\HttpKernel\Client</parameter>
+        <parameter key="test.client.parameters" type="collection"></parameter>
+        <parameter key="test.client.history.class">Symfony\Component\BrowserKit\History</parameter>
+        <parameter key="test.client.cookiejar.class">Symfony\Component\BrowserKit\CookieJar</parameter>
+    </parameters>
+
+    <services>
+        <service id="test.client" class="%test.client.class%" scope="prototype">
+            <argument type="service" id="kernel" />
+            <argument>%test.client.parameters%</argument>
+            <argument type="service" id="test.client.history" />
+            <argument type="service" id="test.client.cookiejar" />
+        </service>
+
+        <service id="test.client.history" class="%test.client.history.class%" scope="prototype" />
+
+        <service id="test.client.cookiejar" class="%test.client.cookiejar.class%" scope="prototype" />
+
+    </services>
+
+</config>