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
Removing unused codes.
conform declare and initialize order
Updating project configuration for Blackberry port.
Standardize code
[BB] Adding extra lua script resource folder for TestLua.
[BB] Updating project configuration.
Merge pull request #2805 from samuele3hu/test_sample_of_http_bind

Add restrictions on the use of edit box
Standardize code
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
[BB] Updating project configuration.
Merge pull request #2807 from dumganhar/master

[BB] Updating project configuration.
Standardize code
Standardize code
correct the type detecting order forgetNodeTypeName