[+] jetty embedded
[-] removed resources
[=] merged rest into master