small change in web.xml
Merge branch 'master' into shrey-shiro