combine armature to cocos2d-x 2.1.5

combine armature to cocos2d-x 2.1.5