moved servlet, updated XML
Merge pull request #22 from FearsomeFoursome/ARbranch

moved servlet, updated XML