Changes at the controller and the web.xml
Merged