compile error
Merge branch 'master' of https://github.com/w2moon/cocos2d-x