major refactoring and cleanup
use Jetty Maven Plugin
Merge branch 'master' into jetty7
Merge branch 'jetty7' into heroku