web
Merge pull request #1 from LantaoJin/master

sync
Merge pull request #2 from LantaoJin/master

sync
web
Merge pull request #5 from qingxiang/master

web