Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic...