CCLAyerPanZoom: change calculating scale and position Conflicts:
CCLAyerPanZoom: change calculating scale and position
Conflicts:

	Extensions/CCLayerPanZoom/CCLayerPanZoom.m

ricardoquesada/cocos2d-iphone-extensions,VinceeeWang/cocos2d-iphone-extensions,digitalhoax/cocos2d-iphone-extensions,VinceeeWang/cocos2d-iphone-extensions,yaoxiaoyong/cocos2d-iphone-extensions,yaoxiaoyong/cocos2d-iphone-extensions,digitalhoax/cocos2d-iphone-extensions,ricardoquesada/cocos2d-iphone-extensions,cocos2d/cocos2d-iphone-extensions,cocos2d/cocos2d-iphone-extensions