add db persistence
add jetty support
merge step6