Added jetty plugin
Merge branch 'develop'