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

modules/blockbanner/blockbanner.tpl

@@ -29,7 +29,7 @@
 	<div class="container">
 	  <a href="{$banner_link}" title="{$banner_desc}">
 		{if isset($banner_img)}
-			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt=""/>
+			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt="{$banner_desc}" title="{$banner_desc}"/>
 		{else}
 			{$banner_desc}
 		{/if}

modules/blockcategories/category-tree-branch.tpl

@@ -25,7 +25,7 @@
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
 	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
+		title="{$node.name|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}