Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/template/header.tpl

@@ -243,7 +243,7 @@
 
 	<div id="main">
 
-		<div id="sidebar" class="page-sidebar nav-collapse collapse">
+		<div id="sidebar" data-spy="affix" data-offset-top="0" class="page-sidebar nav-collapse collapse">
       	{if !$tab}
 			<div class="mainsubtablist" style="display:none"></div>
 		{/if}
@@ -277,7 +277,7 @@
 						<li {if $t2.current} class="active"{/if}>
 							<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
 								{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
-								<i class="icon-chevron-sign-right pull-right"></i>
+								<!-- <i class="icon-chevron-sign-right pull-right"></i> -->
 							</a>
 						</li>
 						{/if}