1.add remove single CCArmatureData,CCAnimationData,CCTextureData method
2.remove getTextureAtlasWithImageName and getTextureAtlasWithDisplayName method, add getTexureAtlasWithTexture method
1.change purgeArmatureSystem() method to purge()
2.remove CCShaderDisplayData
3.support add all kind of CCNode as bone's display
add get data method
fix armature setColor
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/SceneEditorTest/SceneEditorTestScene.cpp
Merge pull request #30 from 2youyouo2/v2x

update armature