Merge branch 'master' of github.com:Bendr0id/TimeTrack