Merge pull request #5069 from natural-law/develop

closed #3712, Add relative path for CCFileUtils.h in CCConsole.cpp.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop