Fix timesheet tests
ove location rerdirect logic
Merge branch 'feature/55397552_who_else_is_working' of github.com:amberbit/KarmaTracker into feature/55397552_who_else_is_working

Conflicts:
	spec/features/timesheet_spec.rb