close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
update xcode project.
fix compiling error cause by include a non-existent file.
fix compiling error cause by miss include header file.
move some method to FontFreeType that only relating to FontFreeType from Font.
fix crash cause by string(null).
Merge pull request #5137 from Dhilan007/develop_crash

fix crash cause by string(null).
closed #2572, The arithmetic of child's position in ParallaxNode::addChild() is wrong.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
close #3802: Add some manual lua-binding functions for the Lable and update the related test cases
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
issue #3781, Update genbinding script to fit new bindings-generator.
Merge pull request #5125 from Dhilan007/develop_label

close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
Merge pull request #5139 from samuele3hu/developPerf

closed #3802:Add some manual lua-binding functions for the cocos2d::Lable and update the related test cases
issue #3781: Fix the variable name.
issue #3781, Add windows bat script.
fix:Add the  “setZOrder” and “getZOrder”  deprecated functions of the Node class in the lua’s script and update the related test cases
Merge pull request #5138 from natural-law/develop

closed #2572, Amend the arithmetic of child's position in ParallaxNode::addChild().
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix