Fixed web.xml issue as merging with git did not work as expected (must
have done something wrong, but don't know what).