Merge pull request #35 from roselone/master

server update get add delete modify
client update gui add menu and its detail again and so on prepare to add camera
Merge branch 'master' of https://github.com/bxl1989/FootWith
client update gui add menu and its detail again and so on prepare to add camera
Merge pull request #52 from purejade/master

update
Merge pull request #53 from purejade/master

update
add Site servlet
Merge branch 'master' into roselone
Merge branch 'master' into roselone
journal add modify and divicer
Merge pull request #36 from roselone/master

others
Merge branch 'master' of https://github.com/bxl1989/FootWith
prepare to do picture
Merge pull request #54 from bxl1989/master

journal modify add and divider an prepare to picture
Merge branch 'master' into roselone
web add get site
modify login.activity
Merge pull request #21 from roselone/master

update