add armature version
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
1.change armatureVersion() to global method
2.fix CCSkin Create crash
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>
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.
1. Remove "CC_DEPRECATED_ATTRIBUTE" for linux;
2. Modify "mk" files;
Modify UIWidget properties initialize
Modify UIDragPanel properties initialize
1. Modify UISlider properties initialize;
2. Modify UITextField properties initialize
Merge commit 'refs/pull/3564/head' of git://github.com/cocos2d/cocos2d-x into master-armature

Conflicts:
	plugin