merge cocos2d-x 2.2 into quick.