Updated.
Merge branch 'master' of github.com:Infosfer/cocos2d-x