[Cocos2d-JS] Correct an issue
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
[Cocos2d-JS] Add AssetsManager documentation
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/zh.md
[Cocos2d-JS] Remove script language specification
Merge pull request #300 from pandamicro/master

[Cocos2d-JS] Add AssetsManager documentation