Master

update master from cocos2d