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
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change tab to 4 space
change definition to pointer
change tab to 4 space
Merge pull request #3801 from 2youyouo2/master

[ci skip]update armature