Merge branch 'franck' into admin

Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php

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

@@ -44,7 +44,7 @@
 
         <service id="router.admin" class="%router.class%">
             <argument type="service" id="router.admin.xmlLoader"/>
-            <argument>routing.xml</argument>
+            <argument>admin.xml</argument>
             <argument type="collection">
                 <argument key="cache_dir">%kernel.cache_dir%</argument>
                 <argument key="debug">%kernel.debug%</argument>
@@ -56,10 +56,12 @@
             <call method="setContext">
                 <argument type="service" id="request.context"/>
             </call>
+<!--
             <call method="add">
                 <argument type="service" id="router.default_route"/>
                 <argument>-255</argument>
             </call>
+-->
             <call method="add">
                 <argument type="service" id="router.admin"/>
                 <argument>0</argument>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="blog" path="/">
-        <default key="_controller">Thelia\Controller\Admin</default>
-    </route>
-</routes>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <import resource="admin_routing.xml" prefix="/admin" />
-</routes>