Update Cocos2d-x
Merge pull request #494 from pandamicro/master

Update Cocos2d-x