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

Update submodules with AssetsManager
issue #5281: fix AndroidManifest.xml format error
Feature #4977: Add bindings for AssetsManager
Merge pull request #404 from joshuastray/master

issue #5281: fix AndroidManifest.xml format error
Issue #5335: Fix some issues
Issue #5335: Add spine manual binding functions
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Fixed #5022: Add spine, websocket, socket to template by default