Lots of timesheet changes
Merge branch 'master' of https://github.com/mikaelvonpfaler/JustPayPhone