Mavenized
removed old way of doing things
Merge branch 'master' of https://github.com/brieweb/SimpleWebTests