Revert "Updated junit to latest. Reorganized web.xml to proper order. Removed old test class"

This reverts commit 9b7d166ed14716e79c359e6df595757614b73f9d.
Fixed web.xml
Merge branch 'master' of github.com:dellinger/inventory