Move logic from rest to timereport service
Merge branch 'master' of https://github.com/Zerotech/tm