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