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
Fixed #4512: JSB script support added to Component
Merge pull request #5932 from pandamicro/ComponentScriptSupport

Component script support