closed #3628:Integrate LabelAtlas with new Label
fix compiling error cause by sprintf_s.
update project file.
remove unneeded empty line.
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
issue #3628: Adds missing files for iOS and Mac.
Merge pull request #1 from dumganhar/new-label-atlas

issue #3628: Adds missing files for iOS and Mac.
Merge pull request #5086 from Dhilan007/develop_label

closed #3628:Integrate LabelAtlas with new Label
Update CHANGELOG [ci skip]
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs