Merge pull request #712 from natural-law/develop

Update the reference of submodule cocos2d-console.
Replace some function callings from deprecated to new function name.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into Iss5819_SyncFunctionName
Merge pull request #713 from dingpinglv/Iss5819_SyncFunctionName

Replace some function callings from deprecated to new function name.
Update cocos2d-x
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update plugin ref to original repo
issue #5821 : don't report error if call succeed
Merge pull request #714 from pandamicro/develop

Update cocos2d-x
issue #5821 : fix indentation
Merge pull request #715 from joshuastray/develop

issue #5821 : don't report error if call succeed