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
Adds missing config files for CCConfiguration

...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
Merge pull request #2794 from ricardoquesada/missing_config_files

Missing config files
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2798 from CocosRobot/updategeneratedsubmodule_1370569307

[AUTO] : updating submodule reference to latest autogenerated bindings
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
Fix flags for debugger server socket

 * Works on iOS and Android
Update AUTHORS [ci skip]
Merge pull request #2799 from dumganhar/master

[master] Fix flags for debugger server socket, works on iOS and Android.
Updating multi-platform-xxx template for win32.
Merge pull request #2801 from dumganhar/master

Updating multi-platform-xxx template for win32.. And some warning fixes.
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