Merge branch 'master' into templateallthemarkup

Conflicts:
	examples/htdocs/jasmine-local-popup.html
	tools/htdocs/Makefile

diff --cc examples/htdocs/jasmine-local-popup.html
index e5792e0,d5758b3..cde7ac2
--- 1/examples/htdocs/jasmine-local-popup.html
--- 2/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@@ -19,11 -21,11 +21,12 @@@
      <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>
+     <script type="text/javascript" src="src/mkws-widget-categories.js"></script>
      <script type="text/javascript" src="src/mkws-widget-log.js"></script>
      <script type="text/javascript" src="src/mkws-widget-record.js"></script>
 +    <script type="text/javascript" src="src/mkws-templates.js"></script>
- 
-     <script type="text/javascript" src="src/mkws-jquery.js"></script>
+     <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
+     <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
  
      <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
      <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">

diff --cc src/mkws-core.js
Simple merge

diff --cc src/mkws-team.js
Simple merge

diff --cc src/mkws-widget-main.js
Simple merge

diff --cc tools/htdocs/Makefile
index 02d64f8,420bb49..c62af37
--- 1/tools/htdocs/Makefile
--- 2/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@@ -16,14 -16,22 +16,23 @@@ JQUERY_UI_URL =    http://code.jquery.com/
  VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
  
  COMPONENTS = ${SRC}/mkws-handlebars.js \
-       ${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.js \
+       ${SRC}/mkws-core.js \
+       ${SRC}/mkws-team.js \
+       ${SRC}/mkws-filter.js \
 +      ${SRC}/mkws-templates.js \
-       ${SRC}/mkws-widget.js ${SRC}/mkws-widget-main.js ${SRC}/mkws-widget-termlists.js \
-       ${SRC}/mkws-widget-authname.js ${SRC}/mkws-widget-categories.js ${SRC}/mkws-widget-log.js \
-       ${SRC}/mkws-widget-record.js ${SRC}/mkws-widget-reference.js ${SRC}/mkws-widget-builder.js
+       ${SRC}/mkws-popup.js \
+       ${SRC}/mkws-widget.js \
+       ${SRC}/mkws-widget-main.js \
+       ${SRC}/mkws-widget-termlists.js \
+       ${SRC}/mkws-widget-authname.js \
+       ${SRC}/mkws-widget-categories.js \
+       ${SRC}/mkws-widget-log.js \
+       ${SRC}/mkws-widget-record.js \
+       ${SRC}/mkws-widget-reference.js \
+       ${SRC}/mkws-widget-builder.js
  
  GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
 -      mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
 +      mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js mkws-templates.js
  
  **make-default**: all
  
@@@ -88,9 -95,10 +96,13 @@@ mkws.js: mkws-templates.js $(COMPONENTS
        mv -f $@.tmp $@
        chmod 444 $@
  
 +mkws-templates.js:
 +      handlebars -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f ${SRC}/mkws-templates.js
 +
+ mkws-html-includes: 
+       echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \
+         perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+ 
  distclean: clean
        @echo "(No need for distclean, 'make clean' is fine)"