C-103

dff
Merge branch 'chengHitong'
Merge branch 'master' of https://github.com/4SSTORE/HEHE