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
merge newest version
issue #2103 add webSocket lua test sample
issue #2103 add webSocket lua test sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
standardize code
issue #2103 add webSocket lua test sample
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
issue #2103 add webSocket lua test sample
1.remove #pragma endregion
2.change str.compare("")==0 to str.length()==0
move const value to CCDataReaderHelper.cpp
issue #2103 add webSocket lua test sample
Removing unused codes.
conform declare and initialize order
issue #2103 add webSocket lua test sample
Updating project configuration for Blackberry port.
issue #2103 add webSocket lua test sample
Merge pull request #2803 from samuele3hu/test_sample_of_http_bind

fixed #2103: Lua bind of websocket and add a test sample
Standardize code