Update Cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #429 from pandamicro/master

Update Cocos2d-x