combine armature to cocos2d-x 2.1.5
Merge branch 'v2x' of https://github.com/2youyouo2/cocos2d-x into v2x