Fix timesheet issues
Merge branch 'timesheet-fix' into develop
Merge branch 'develop' of github.com:openlabs/nereid-project into develop