Merge pull request #5546 from nutty898/master_nutty_modify_framework_for315

Fixd bugs for editor
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5607 from CocosRobot/updategeneratedsubmodule_1394160073

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge branch 'master' into master_nutty_modify_framework_for315