Merge branch 'master' into templateallthemarkup

diff --combined examples/htdocs/jasmine-popup.html
index a6d1fff,57b8d9f..80c50bb
--- 1/examples/htdocs/jasmine-popup.html
--- 2/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@@ -10,7 -10,7 +10,7 @@@
      <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
      <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
      <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
 -    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
 +    <script type="text/javascript" src="tools/htdocs/handlebars-v1.3.0.js"></script>
  
      <script type="text/javascript" src="src/mkws-handlebars.js"></script>
      <script type="text/javascript" src="src/mkws-core.js"></script>
@@@ -18,7 -18,6 +18,7 @@@
      <script type="text/javascript" src="src/mkws-filter.js"></script>
      <script type="text/javascript" src="src/mkws-popup.js"></script>
      <script type="text/javascript" src="src/mkws-widget.js"></script>
 +    <script type="text/javascript" src="src/mkws-templates.js"></script>
      <script type="text/javascript" src="src/mkws-widget-main.js"></script>
      <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
      <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
@@@ -53,8 -52,7 +53,7 @@@
      // use a our main service proxy with mkws test account
      var mkws_config = {
        perpage_default: 10,
-       pazpar2_url:          "//sp-mkws.indexdata.com/service-proxy/",
-       service_proxy_auth:   "//sp-mkws.indexdata.com/service-proxy-testauth"
+       sp_auth_credentials: "mkwstest/mkwstest"
      };
  
      var jasmine_config = {