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

Updates cocos2d-x