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
Update cocos2d-html5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #107 from chuanweizhang2013/master

update template cocos-project-template json
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
update submodule
Merge pull request #114 from lihex/master

update submodule
Merge pull request #97 from samuele3hu/bug_fix

close #4285: Modify the mechanism of  callback bound to js for  studio ui and armature
Merge pull request #116 from chuanweizhang2013/master

update adndroid build
Merge pull request #6 from cocos2d/master

update template