add Site servlet
Merge branch 'master' into roselone
Merge branch 'master' into roselone
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 #37 from roselone/master

update divider