Update cocos2d-x.
Merge pull request #142 from dumganhar/master

Update cocos2d-x.