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
1. modify scrollview addchild
2. modify listview dealloc.
Merge pull request #31 from chengstory/#4600

1. modify scrollview addchild
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x
reset CCParticleSystem before show it
Merge pull request #32 from 2youyouo2/v2x

update armature
1， merge v2.1.5 to v2x
Merge pull request #33 from chengstory/#4519

1， merge v2.1.5 to v2x
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x
no message
Merge pull request #34 from chengstory/#4620

no message
retain movement event and frame event target
Merge pull request #35 from 2youyouo2/v2x

retain movement event and frame event target
change CC_SYNTHESIZE_PASS_BY_REF to CC_SYNTHESIZE
Merge pull request #36 from 2youyouo2/v2x

change CC_SYNTHESIZE_PASS_BY_REF to CC_SYNTHESIZE