Merge branch 'develop'
chenhao
Merge branch 'develop'
Merge branch 'master' of https://github.com/yizhi401/cocos2dx_demo