Updates cocos2d-x
Updates cocos2d-x
Merge pull request #187 from dumganhar/master

Updates cocos2d-x