merge
Merge branch 'master' of github.com:zxc122333/node-cocos2d-x