merge code from develop to make CCImage::initWithImageFileThreadSafe() thread-safe
Remove "layoutexecutant" class
Merge branch 'master' into #4559
Merge branch 'master' into 4559
Modify mk files
Modify mac project file
fix release2.2 : testJavaScript resource search path and resolution show bug
Merge pull request #3770 from dabingnn/release22_bug_hot_fix

[ci skip]Release22 bug hot fix
Modify windows project.
Update the code of submodule plugin.
[master] Ignoring *.xccheckout file.
[master] Fix of variable assignment when using CCB and JSB.
Merge pull request #3775 from dumganhar/ccb-control-master

[master] Fix of variable assignment when using CCB and JSB.
Merge pull request #3771 from nutty898/4559

[GUI] Remove layoutexecutant class
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Modify layout enum
Merge pull request #3776 from nutty898/ModifyLayoutEnum

[GUI] Modify layout enum
[master] Updating Bindings-generator.
Merge pull request #3777 from dumganhar/master

[master] Updating Bindings-generator.
[master] iOS JSB project fixes.