issue #5253: fix invalid native object bug in AsstesManagerTest
Merge pull request #429 from pandamicro/master

Update Cocos2d-x
Merge pull request #430 from joshuastray/master

issue #5253: fix invalid native object bug in AsstesManagerTest
Update Cocos2d-console
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js