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

Conflicts:
	templates/default/login.html

templates/admin/default/includes/header.inc.html

@@ -69,7 +69,7 @@
 	    </form>
 	    {/loop}
 
-  		<div class="view-shop"><a href="{$INDEX_PAGE}" title="{intl l='View site'}" target="_blank"><i class="icon-white icon-eye-open"></i> {intl l="View shop"}</a></div>
+  		<div class="view-shop"><a href="{navigate to="index"}" title="{intl l='View site'}" target="_blank"><i class="icon-white icon-eye-open"></i> {intl l="View shop"}</a></div>
     </div>
 </div>
 
@@ -164,4 +164,4 @@
     <div class="brandbar brandbar-wide container">
         <a class="brand" href="{url path='/admin'}">{images file='../assets/img/logo-thelia-34px.png'}<img src="{$asset_url}" alt="{intl l='Thelia, solution e-commerce libre'}" />{/images}</a>
     </div>
-{/elseloop}
+{/elseloop}