testing
changed web-inf
fixed merge conflicts