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

moved servlet, updated XML