Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
close #4285: Modify the mechanism of add.*EventListener bound to js for cocos2d ui
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
add reaload js modulefile arg
tab -> space
modify reload arg
Update cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #112 from dingpinglv/Iss4277_ReleaseV3.0

Issue #4277: clean the template of Cocos2d-js
add js runtime
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js

Conflicts:
	templates/js-template-default/cocos-project-template.json
Merge pull request #107 from chuanweizhang2013/master

update template cocos-project-template json
merge Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #111 from pandamicro/master

Update cocos2d-html5
Merge pull request #113 from lihex/master

update submodule
add binding