Merge remote-tracking branch 'cnnic/dev'
Merge pull request #315 from warmdawn/dev

change logger.info to debug
Merge remote-tracking branch 'cnnic/dev'
update war
Merge pull request #316 from forumbyr/master

update war
update sql,delte comment; delete Chinese mark comment.
Merge pull request #318 from forumbyr/master

update sql,delte comment; delete Chinese mark comment.
update war
Merge pull request #320 from forumbyr/master

update war
update war and sql
Merge pull request #322 from forumbyr/master

update war and sql
update db doc
Merge pull request #324 from forumbyr/master

update db doc
add java doc
Merge pull request #325 from forumbyr/master

add java doc
add class description