Bug fixes
Merge branch 'master' of https://github.com/pavanaja-manne/timetracker-new