Adding more Servlets
Adding more Servlets, removing Template docs
Adding web.xml
merged changes