add armature version
Remove the code of plugin.
remove unused resource
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change tab to 4 space
1.change setCBBody \getCBBody  to setBody \getBody
2.add getShapeList method
Add plugin code as submodule in branch master
1.change armatureVersion() to global method
2.fix CCSkin Create crash
Merge pull request #3566 from natural-law/master

Add plugin code as submodule in branch master[ci skip]
Adds Alloc Performance Test to master

back ported Alloc performant test from develop to master

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
Updates iOS and Mac projects to include the new Alloc Test

Updates iOS and Mac projects to include the new Alloc Test

Tested on:

OS X 10.9 with Xcode 5.0-preview

- iOS project works OK.
- Mac project works OK with Xcode 5, but it didn't finish linking on Xcode 4. I guess it is a bug with OS X 10.9. Unfortunately I don't have a OS X 10.8 to test it.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
1. add virtual void setNode(CCNode *) and CCNode* getNode() to CCComponent.
2. add setNode to CCComRender.
3. revert getInnerContainer() in UIDragPanel.
Merge pull request #3573 from chengstory/#4553

1. add virtual void setNode(CCNode *) and CCNode* getNode() to CCCompone...
fix compiling error on mac and add PerformanceAllocTest to other platform project settings
add PerformanceAllocTest to vs project
use %u on native client
Merge pull request #3577 from minggo/master_alloc_perf_test

Master alloc perf test
fix set color
1. Modify GUI lib;
2. Modify memory mange to "autorelease";
1.  fixes failed to build on windows.