Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php

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

@@ -72,6 +72,13 @@
 
     <services>
 
+        <!--  URL maganement -->
+
+        <service id="thelia.url.manager" class="Thelia\Tools\URL">
+            <argument type="service" id="service_container" />
+            <argument >%kernel.environment%</argument>
+        </service>
+
         <service id="event_dispatcher" class="Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher">
             <argument type="service" id="service_container" />
         </service>
@@ -85,12 +92,6 @@
         	<argument type="service" id="service_container"/>
         </service>
 
-        <!--  URL maganement -->
-
-        <service id="thelia.url.manager" class="Thelia\Core\Tools\URL" scope="request">
-            <argument type="service" id="request" />
-        </service>
-
 		<!--  Translation and internationalisation -->
 
 		<service id="thelia.translator" class="Thelia\Core\Translation\Translator">

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

@@ -49,8 +49,11 @@
         <default key="_controller">Thelia\Controller\Front\CartController::changeItem</default>
         <default key="_view">cart</default>
     </route>
-
+<!--
+Empêche l'accès àl'admin, genre: http://localhost/thelia2/index_dev.php/admin/login amène sur l'accueuil de la boutique
     <route id="url-rewriting.check" path="/{rewritten_url}" methods="GET">
         <default key="_controller">Thelia\Controller\Front\UrlRewritingController::check</default>
+        <requirement key="rewritten_url">.*</requirement>
     </route>
+-->
 </routes>