Reformatted code according to styleGuide.
Reformatted tests aswell.
Cleanup up pom.
Moved web.xml to standard location.
Clean up web.xml