HappyBear First Commit
HappyBear
Merge branch 'master' of https://github.com/shixinzhu/cocos2d-x