fix update timeentries
Merge branch 'dev'