user_id fix
Merge branch 'master' of github.com:ir4y/timetracker