fix up timesheets
add autocompletes
Merge remote-tracking branch 'upstream/master'