Merge pull request #6202 from natural-law/develop

Update the reference of submodule cocos2d-console.
Fix for CC_CALLBACK_3 macro
Merge pull request #6203 from dumganhar/develop

Fix for CC_CALLBACK_3 macro