Merge pull request #2 from cocos2d/develop

update
Merge pull request #3 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #4 from cocos2d/develop

sync original repo
Merge pull request #5 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
update exception catch clause
Merge pull request #6 from cocos2d/develop

sync original repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
change interface
Develop branch adds lua trigger for CocoStudio
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1
Adds override keyword for some override methods in gui::Widget class.
ccs.XXX —> ccui.XXX for gui js bindings.
Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii.
Updates JS-Test submodule reference.
Add missis “ccs.” prefix
Merge pull request #4781 from dumganhar/js-ui-test

Updates JSB gui test
Merge pull request #4777 from 2youyouo2/develop

update armature, change interface from "by" to "with"