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
Merge pull request #3763 from minggo/merge-thread-safe

make CCImage::initWithImageFileThreadSafe() thread-safe
Add CCScrollView and CCTableView lua binding and related test samples
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test
issue #2837:Add a newline
issue #2837: Modify platform compile config files
Bind CCEGLViewProtocol and CCEGLView for JSB.
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
[master] Marmalade doesn't support chipmunk, define ENABLE_PHYSICS_BOX2D_DETECT in Armature instead.
[master] [Marmalde] Updating .mkf files.
Merge pull request #3786 from dumganhar/master

[master] Marmalade fixes
update configuration to let CCEGLView no constructor
update subproject commit
Merge pull request #3787 from Dhilan007/master

Bind CCEGLViewProtocol and CCEGLView for JSB.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3788 from CocosRobot/updategeneratedsubmodule_1380031200

[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
[master] Windows compilation fix.
Merge pull request #3789 from dumganhar/master

[master] Windows compilation fix.