Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
merge code from develop to make CCImage::initWithImageFileThreadSafe() thread-safe
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Adds missing icons for IOS7.
Update the code of submodule plugin.
1.Fix not hide status on IOS7.
Merge pull request #3778 from dumganhar/master

[master] iOS JSB project fixe and update JS-Test.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3780 from CocosRobot/updategeneratedsubmodule_1379947517

[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
Merge pull request #3772 from Dhilan007/master

Adds missing icons for IOS7.
Merge pull request #3773 from natural-law/master

Update the code of submodule plugin.
Merge pull request #3763 from minggo/merge-thread-safe

make CCImage::initWithImageFileThreadSafe() thread-safe
[master] Marmalade doesn't support chipmunk, define ENABLE_PHYSICS_BOX2D_DETECT in Armature instead.
[master] [Marmalde] Updating .mkf files.