Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
1.when add a skin to last index, applay it's skindata to the previous skindata
2.Do not retain target when regist frame event and movement event
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
1.remove compiler wornings
2.change void Bone::removeFromParent(bool recursion);  to void Bone::removeFromParent();
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
fix compiler warning
add setUserObject method to CCArmatureAnimation
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Merge pull request #4165 from 2youyouo2/develop

[ci skip]update armature
Resolve some warning and modify uint32_t to long
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck

Conflicts:
	tools/bindings-generator
Update bindings-generator
Merge pull request #4200 from samuele3hu/developCheck

Resolve some warning and modify uint32_t to long
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS