Fix package & references
Merge branch 'master' of https://github.com/wouterdeman/timesheet.service