Complete Servlet of the project
Merge origin/master