begin fixing code style in concat.js
Merge branch 'master' of https://github.com/headissue/Sahi

Conflicts:
	sahi-core/htdocs/spr/concat.js
Fix script name in test suite
Merge remote-tracking branch 'origin/master' into log4j