Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
do not retain target when regist frame event and movement event
when add a skin to last index, applay it's skindata to the previous skindata
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Fix compile warning
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
add setUserObject method to CCArmatureAnimation
Merge pull request #4167 from 2youyouo2/master

[ci skip]update armature