Fixes bug about overlapped time entries by default
Merge branch 'master' of https://github.com/amberbit/KarmaTracker