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

Conflicts:
	templates/admin/default/admin-layout.tpl

templates/admin/default/admin-layout.tpl

@@ -227,15 +227,14 @@
 
 	{block name="after-javascript-include"}{/block}
 
-	{javascripts file='assets/js/bootstrap/bootstrap.js'}
-	    <script src="{$asset_url}"></script>
-	{/javascripts}
-
     {block name="javascript-initialization"}{/block}
+
     {debugbar_render}
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
 
-	{debugbar_render}
+    {javascripts file='assets/js/bootstrap/bootstrap.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 </body>
 </html>