Workweek end commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	tsfw_src/ch/timesplinter/template/TemplateEngine.class.php
Merge remote-tracking branch 'origin/master'
DB class extended to have the possibility of listeners for db events