Statistic-Anpassungen
Merge remote-tracking branch 'origin/master'

Conflicts:
	task/show_task.php
Merge remote-tracking branch 'origin/master'
Statistic-Anpassungen