CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).
Merge pull request #6937 from wefiends/Mac-UserDefault

CCUserDefault.cpp: Should not compile on Mac platform
fix memory leak
fix coding style
Merge pull request #6942 from minggo/memory-leak-sprite-frame-cache

Memory leak sprite frame cache
[ci skip]
Update the reference of submodule cocos2d-console.
Merge pull request #6943 from natural-law/v3

Update the reference of submodule cocos2d-console.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label
Added missing files to XCode project.