Enabling time log
Merge branch 'develop'