Refactored Servlets
Merge branch 'master' of https://github.com/danielguerber/Apsi