Refactor tempaltes for the changes in timesheet
Release version 2.6.2.0
Merge branch 'release/2.6.2.0' into develop