Update submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #826 from pandamicro/develop

	Update submodules