Arbeiter anlegen php
Merge branch 'master' of https://github.com/nicooler/WorkspaceDienstplan
Merge branch 'master' of https://github.com/nicooler/WorkspaceDienstplan

Conflicts:
	php/Dienstplan2/comment.php