Added HTMLServlet and JSONServlet