Merge pull request #1902 from pandamicro/develop

Bug fixes
Merge pull request #1904 from pandamicro/develop

Refactor #5096: Improve performance of cc.rectIntersectsRect
Fixed #5540: Refactor ccui.TextAtlas setStringValue to setString