update

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>
Merge branch 'master' of github.com:cognovis/intranet-timesheet2

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>

Conflicts:
	www/absences/new.tcl