Fixes varios TimeTracker
Merge branch 'R3' of ssh://git@github.com/odea-examples/TimeTracker.git into R3