Merge branch 'master' into ding1-theme

Conflicts:
	mkdru.client.js
	mkdru.theme.js

diff --cc mkdru.theme.js
index bcbc9cd,229c482..fa4964c
--- 1/mkdru.theme.js
--- 2/mkdru.theme.js
+++ b/mkdru.theme.js
@@@ -162,24 -142,5 +162,24 @@@ Drupal.theme.prototype.mkdruFacet = fun
  };
  
  Drupal.theme.prototype.mkdruFacetContainer = function (facetsCfg) {
-     var fs = [];
 -  return "";
++  var fs = [];
 +  for (var fname in facetsCfg) {
 +    facetsCfg[fname].originalKey = fname;
 +    fs.push(facetsCfg[fname]);
 +  }
 +  fs.sort(function (a,b) { return a.orderWeight - b.orderWeight });
 +  var html = '<div class="content"><table class="mkdru-facets-table"><tr>';
 +  for (var i=0; i<fs.length; i++) {
 +    var f = fs[i];
 +    html += '<td><fieldset class="form-wrapper">'
 +    html += '<legend><span class="fieldset-legend">'+f.displayName
 +      +'</span></legend>';
 +    html += '<div class="fieldset-wrapper">';
 +    html += '<div class="mkdru-facet-list-container mkdru-facet-'
 +      +f.originalKey+'"/>';
 +    html += '</div>';
 +    html += '</fieldset></td>'
 +  }
 +  html += '</tr></table></div>';
 +  return html;
  };