Merge pull request #1 from cocos2d/develop

Merge cocos2d:develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge pull request #2 from pandamicro/develop

Merge cocos2d:develop
[add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code

-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
Merge pull request #5927 from dumganhar/develop

Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
Fixed #4512: JSB script support added to Component
Merge pull request #5932 from pandamicro/ComponentScriptSupport

Component script support
Merge pull request #3 from pandamicro/develop

Sync Cocos2d-x
Issue #3897: Add missed constructors
Merge pull request #5938 from pandamicro/develop

Issue #3897: Add missed constructors
Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923
tab -> 4 spaces, whitespace cleanup.
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
Merge pull request #5939 from dumganhar/merge5923

Merge PR #5923: implement fireEventToScript method to integrate JSB event handling with the original native code
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
  tab -> 4 spaces, whitespace cleanup.
  Issue #3897: Add missed constructors
  Fixed #4512: JSB script support added to Component
  Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
  [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code