Changed the server implementation from nanoHttpd to jetty.
Merge remote-tracking branch 'origin/master'