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
Merge pull request #5072 from natural-law/develop

closed #3688, LabelAtlas set a shorter string than before, the effect will be wrong.