upgraded jetty version
fixed accumulative update
Merge branch 'master' into spaceape-build
fixed accumulative update
Merge branch 'master' into spaceape-build