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.
Merge pull request #5125 from Dhilan007/develop_label

close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.