Delete task UI and servlet
Resolved conflicts