update war
Merge pull request #320 from forumbyr/master

update war
Merge pull request #321 from cnnic/dev

Dev