Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Update the reference of submodule cocos2d-console.
Merge branch 'v3' of github.com:natural-law/cocos2d-x; branch 'v3' of github.com:cocos2d/cocos2d-x into v3