Merge branch 'admin' of github.com:thelia/thelia into admin

Conflicts:
	core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterSmartyPluginPass.php
	core/lib/Thelia/Core/Template/Assets/AsseticHelper.php

web/.htaccess

@@ -8,7 +8,5 @@ AddDefaultCharset UTF-8
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
 
-	RewriteBase /thelia2
-
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>