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

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/admin-layout.tpl

templates/admin/default/admin-layout.tpl

@@ -222,19 +222,20 @@
 	{block name="before-javascript-include"}{/block}
 
 	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
-{*
+
     {debugbar_renderjs}
     {debugbar_renderresult}
-*}
+
 	{block name="after-javascript-include"}{/block}
 
+    {javascripts file='assets/js/bootstrap/bootstrap.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
     {block name="javascript-initialization"}{/block}
 
 	{* Modules scripts are included now *}
 	{module_include location='footer_js'}
 
-    {javascripts file='assets/js/bootstrap/bootstrap.js'}
-        <script src="{$asset_url}"></script>
-    {/javascripts}
 </body>
 </html>