Merge pull request #345 from wade1012/dev

Dev Wade
Merge pull request #347 from wade1012/dev

Dev Wade
update war ;add cer.
Merge pull request #348 from forumbyr/master

update war ;add cer.
Merge pull request #5 from cnnic/dev

Dev