fixed json bugs
Merge pull request #49 from bxl1989/master

basic and menu
add journal web service
Merge branch 'master' into roselone
modify journal servlet
Merge pull request #35 from roselone/master

server update get add delete modify