Manage TimeSheet

- merge database
- modify effort page