issue#3630:Adjust some method for more easily create and change type.
update lua binding configuration for label.
1.update lua binding configuration for label.
2.recover old method[createWithTTF]
closed #3712, Add relative path for CCFileUtils.h in CCConsole.cpp.
Merge pull request #1 from cocos2d/develop

update cc2dx/develop
add check data valid in getStringFromFile

so far no check would be crashed when getData faild.
maybe return an empty string is better.
Merge pull request #5069 from natural-law/develop

closed #3712, Add relative path for CCFileUtils.h in CCConsole.cpp.
closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Relieve inherit from LabelProtocol
fix compiling error
Console::log(format, va_args) is private

log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
Merge pull request #5073 from ricardoquesada/console_log_fixes

Console::log(format, va_args) is private
Renderer performance fixes

QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
fixes #3720
Merge pull request #5074 from luisparravicini/issue-3720

fixes #3720
Updates Xcode, Android and Linux project

with new BatchCommand
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand

BatchCommand is being used by SpriteBatchCommand and ParticlesBatchCommand

This improves performance in batches
Updates CHANGELOG
Merge pull request #5075 from ricardoquesada/renderer_perf_fixes

Renderer perf fixes