Make sure where is set
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	phprojekt/application/Timecard/Models/Timecard.php