Merge branch 'master' into prettysimple

Conflicts:
	src/templates/facets.handlebars

diff --combined test/spec/mkws-pazpar2.js
index 21ea770,ccc161e..2cfe93d
--- 1/test/spec/mkws-pazpar2.js
--- 2/test/spec/mkws-pazpar2.js
+++ b/test/spec/mkws-pazpar2.js
@@@ -227,13 -227,13 +227,13 @@@ describe("Check pazpar2 hit counter", f
      });
  });
  
- describe("Check Termlist", function () {
+ describe("Check Facets", function () {
      var $ = mkws.$;
  
-     it("found Termlist", function () {
-         var termlist = $("div.mkws-termlists");
-         debug("Termlist success: " + termlist.length);
-         expect(termlist.length).toBe(1);
+     it("found Facets", function () {
+         var facets = $("div.mkws-facets");
+         debug("Facet success: " + facets.length);
+         expect(facets.length).toBe(1);
  
          waitsFor(function () {
              return $("div.mkws-facet[data-mkws-facet='xtargets']").length == 1 ? true : false;
@@@ -242,7 -242,7 +242,7 @@@
          // everything displayed?
          runs(function () {
              var sources = $("div.mkws-facet[data-mkws-facet='xtargets']");
-             debug("Termlist sources success: " + sources.length);
+             debug("Facet sources success: " + sources.length);
              expect(sources.length).toBe(1);
  
              var subjects = $("div.mkws-facet[data-mkws-facet='subject']");
@@@ -707,7 -707,7 +707,7 @@@ describe("Check SortBy options", functi
              $("div.mkws-records").unbind("DOMNodeInserted DOMNodeRemoved propertychange");
              debug("unbind by sort");
  
 -            var records = $("div.mkws-records > div.mkws-summary > a");
 +            var records = $("div.mkws-records > div.mkws-summary");
              debug("Sort by got now " + records.length + " records");
              expect(records.length).toBe(per_page_number);
          });
@@@ -740,7 -740,7 +740,7 @@@ describe("Check async widget discovery"
        var numInput = $("div.mkws-search input").length;
        debug("Input elements present: " + numInput);
        expect(numInput).toBe(4);
 -      var numRec = $("div.mkws-records > div.mkws-summary > a").length;
 +      var numRec = $("div.mkws-records > div.mkws-summary").length;
        debug("Records should still be present. There are: " + numRec);
        expect(numRec).toBeGreaterThan(0);
      });