initial commit
tweaks
jetty / nginx wip
Merge branch 'master' into jetty_wip
remove nginx
added jetty support