hhhhhhhhhhhhhhhh
Merge branch 'master' of https://github.com/askldfhjg/cocos2d-x

Conflicts:
	samples/Cpp/HelloCpp/Classes/BoneAction/CCBoneSpriteLayer.cpp
eeeeeeeeee