Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
resolve conflict
Fixing warning generated by VS2012.
add miss api
Merge pull request #4344 from dumganhar/develop

Fixing warning generated by VS2012.
Merge pull request #4340 from Dhilan007/jssubmodule

recover controller on layer.
Merge branch 'develop_nutty_modify_bugfixed' into develop_nutty_modify_widgetinheritnode