commit by liunian
commit
Merge remote-tracking branch 'origin/master'
Merge branch '下载管理开发分支'