整合
Merge branch 'fang' into nz
fight更新