Merge pull request #316 from forumbyr/master

update war
Merge pull request #318 from forumbyr/master

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

update war
Merge pull request #322 from forumbyr/master

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

update db doc
Merge remote-tracking branch 'cnnic/dev'
update comment