1.  change “bool isEnabled()”  to "bool isEnabled() const".
2.  dolete license.
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
Merge pull request #2767 from chengstory/master_Components#2

1.  change “bool isEnabled()”  to "bool isEnabled() const".
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
1.upload CCArmature
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
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.