Merge branch 'release-2.4'

Conflicts:
	themes/bootprint3/css/compiled.css
	themes/bootstrap3/css/compiled.css

themes/bootstrap3/less/bootstrap.less

@@ -318,7 +318,7 @@ p.lead {
 /* --- Sidebar --- */
 /* Sidebar rounded corners */
 .sidebar {
-  label {margin-left: 20px;}
+  label:not(.list-group-item) {margin-left: 20px;}
   .list-group:not(.filters) .title {
     cursor: pointer;
     &.collapsed {

themes/bootstrap3/templates/search/advanced/layout.phtml

@@ -154,15 +154,18 @@
       <? if (!empty($searchFilters)): ?>
         <h4><?=$this->transEsc("adv_search_filters")?></h4>
         <div class="list-group">
-          <label class="list-group-item checkbox"><?=$this->transEsc("adv_search_select_all")?> <input type="checkbox" checked="checked" class="checkbox-select-all"/></label>
+          <label class="list-group-item checkbox">
+            <input type="checkbox" checked="checked" class="checkbox-select-all"/>
+            <?=$this->transEsc("adv_search_select_all")?>
+          </label>
         </div>
         <? foreach ($searchFilters as $field => $data): ?>
-          <ul class="list-group">
-            <li class="list-group-item title"><?=$this->transEsc($field)?></li>
+          <div class="list-group">
+            <div class="list-group-item title"><?=$this->transEsc($field)?></div>
             <? foreach ($data as $value): ?>
               <label class="list-group-item checkbox"><input class="checkbox-select-item" type="checkbox" checked="checked" name="filter[]" value='<?=$this->escapeHtmlAttr($value['field'])?>:"<?=$this->escapeHtmlAttr($value['value'])?>"' /> <?=$this->escapeHtml($value['displayText'])?></label>
             <? endforeach; ?>
-          </ul>
+          </div>
         <? endforeach; ?>
       <? endif; ?>
       <div class="sidegroup">