Merge pull request #2449 from dumganhar/master

Updating cocos2d-js-tests.
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.