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
standardize code
1.remove #pragma endregion
2.change str.compare("")==0 to str.length()==0
move const value to CCDataReaderHelper.cpp
conform declare and initialize order
Standardize code
Standardize code
Standardize code
Standardize code
Standardize code
Standardize code
Standardize code
Standardize code
Fixing compilation errors in TestLua for Win32.
Merge pull request #2810 from dumganhar/master

Fixing compilation errors in TestLua for Win32.
Standardize code
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
Merge pull request #2809 from edwardzhou/master

issue #2103: correct the type detecting order for Lua CCBProxy::getNodeTypeName.