Servlets
cleaning
Pom fix
Merge pull request #26 from DonoA/master

Servlet and cleaning