Merge branch 'f-combine-js-files' into 'f-boot-tour'

Makefile

build.properties.d/00_default.properties

misc/merge_js.sh

src/core/js/footer.js

src/core/js/webcaosdb.js

src/core/webcaosdb.xsl

src/core/xsl/main.xsl

src/core/xsl/welcome.xsl

test/core/index.html

test/core/js/modules/welcome.xsl.js