Merge cocos2d:develop