Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
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