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
fix set color
Merge commit 'refs/pull/3564/head' of git://github.com/cocos2d/cocos2d-x into master-armature

Conflicts:
	plugin
Updating tools/tojs/cocos2dx_extension.ini.
[master] [JSB] Adding MotionStreakTest to iOS projects.
[master] CCMotionStreak::create ccColor3B --> const ccColor3B& .
[iOS] Updating TestCpp project config.
[MAC] Updating TestCpp project config.
Merge pull request #3584 from dumganhar/master-armature

Merge PR 3564