fix wrong calculation for billable timelog
fix nil error
Merge branch 'dev' into dev_mirror