users/timrentry migration
Associated time entry with user
Merged conflicts and fixed bug in timeentry user_id