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

Update submodules with AssetsManager