Removed duplicated code regarding creating, editing and deleting time reports.
Solved merge-conflict in ServletBase.