fix add armature display
issue #2726:JSB and html5 has many differences
issue #2726:JSB and html5 has many differences
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.hpp
Revert scripting/javascript/bindings/generated.
restore BuilderReader to _Reader
Modify hellolua link setup in release and add more doxygen  comments
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
Merge pull request #3757 from dabingnn/release22_bug_hot_fix

[ci skip]Release22 bug hot fix: test lua resource searchpath and show bug
fix add display
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
Merge pull request #3758 from samuele3hu/master_test

[ci skip]Modify hellolua link setup in release and add more doxygen comments
1，Modify CCSGUIReader.h CCSGUIReader.cpp filters.
Merge pull request #3759 from chengstory/4875

change CCSGUIReader.h CCSGUIReader.cpp filters.[ci skip]
Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS.
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
Merge pull request #3760 from 2youyouo2/master

update armature
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Fix of non-utf8 character in jsb_cocos2d_extension.js
JS number could be converted to String.
Adding default resource folder 'res' for TestJavascript.