changed layout for TimeEntry views
Merge branch 'master' into reporting