sync
Merge branch 'master' of https://github.com/devmario/cocos2d-x