Fix timesheet tests
Merge branch 'feature/55397552_who_else_is_working' of github.com:amberbit/KarmaTracker

Conflicts:
	spec/features/timesheet_spec.rb