Merge pull request #8 from cocos2d/develop

Pull down
Fixed #3461 : Rewrite the logic of _updateString in CCLabelTTF
Merge pull request #1335 from pandamicro/develop

Fixed #3461 : Rewrite the logic of _updateString in CCLabelTTF