1: fix CCTouchScriptHandlerEntry will release twice lua reference
2: fix the error when texture stroke lable under IOS and Android.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://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
fix the CCTouchScriptHandlerEntry will release twice lua reference.
the _handler must set 0, not NULL.
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