web.xml fix
Merge branch 'master' of https://github.com/XxXZippyXxX/EsempioGit.git
General fix + cleanup