Arreglos tickets R4
Merge branch 'R4' of ssh://github.com/odea-examples/TimeTracker into R4