downgraded to jetty 7
Merge branch 'dev' into statistics

* dev:
  downgraded to jetty 7