issue #2103 add cocosbuilder lua test sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
issue #2103 add cocosbuilder lua test sample
issue #2103 add cocosbuilder lua test sample
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder

add cocosbuilder lua test sample
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2771 from CocosRobot/updategeneratedsubmodule_1370421780

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2103:make HelloLua & TestLua work on vs2010
Merge pull request #2772 from minggo/lua-win32

issue #2103:make HelloLua & TestLua work on vs2010
[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
Merge pull request #2780 from dumganhar/master

[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
Update the flurry SDK version.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
Merge pull request #2783 from minggo/master

make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
Adding libwebsockets license in WebSocket.h/.cpp.
Log error instead of triggering an assert for shadow and stroke.
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp.
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite.
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.