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
Standardize code
Change CCAnimation to CCArmatureAnimation
Standardize code
Standardize code
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix