modify filename
fix grammar mistake
update binding custom class to js for cocos2d-js 3.0 beta upgrade
Merge pull request #307 from linshun/master

Updated cocos2d-js release note, changelog and update guide to cocos2d-js v3.0 beta
[Cocos2d-JS]Add AssetsManager Chinese doc
no message
Merge pull request #308 from linshun/master

Updated setText and getText to setString and getString in update guide.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	manual/framework/html5/zh.md
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #309 from pandamicro/master

[Cocos2d-JS]Add AssetsManager Chinese doc
Merge pull request #310 from linshun/master

fixed error of cc.sequence
Merge pull request #311 from linshun/master

Updated download link
[Cocos2d-JS]Update 3.0beta upgrade guide
Merge pull request #312 from pandamicro/master

[Cocos2d-JS]Update 3.0beta upgrade guide
add setup development
add Cocos Code IDE's changelog
Merge pull request #313 from honghui/master

update document for Cocos Code IDE 1.0.2.beta
some words error fix
update document for cocos code ide 1.0.2 beta.
update document for cocos code ide 1.0.2 beta.