Merge pull request #11 from cocos2d/master

update js
add prebuilt runtime
remove /
update template
update src-start
Merge pull request #184 from dumganhar/master

Updates cocos2d-x
Closed #4277: update README.md
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #185 from dingpinglv/Iss4277_ReleaseV3.0

Closed #4277: update README.md
updaet submodule
Merge pull request #186 from lihex/master

updaet submodule
Merge pull request #187 from dumganhar/master

Updates cocos2d-x
Merge pull request #188 from dumganhar/master

Updates cocos2d-x
uupdate js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	templates/js-template-runtime/cocos-project-template.json
add win32  prebuilt
update submodule
Merge pull request #189 from lihex/master

update submodule
add \n
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js