Adds CCScrollViewDelegate. Only implemented recognition MAC platform
Adds iOS callbacks for CCScrollViewDelegate + Fixes scrollViewDidEndDecelerating for mac
Adding Ease Sine actions
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into EaseSineActions
setZOrder: in CCNode.m

setting the zOrder of the current node is redundant if parent is present and will directly interfere with if( z == child.zOrder ) check in reorderChild:z: from CCSprite, CCSpriteBatchNode and CCParticleBatchNode causing them to defer from reordering their children. 

this is related to issue 598.
updated swap:withNewIndex: in CCSpriteBatchNode.m

textureAtlas quads are not updated to reflect changes to the atlas index of a swapped object. in consequence the draw order does not change. 

related to issue #598.
Merge pull request #605 from kalo-/patch-2

updated swap:withNewIndex: in CCSpriteBatchNode.m
Merge pull request #604 from kalo-/patch-1

updated setZOrder: in CCNode.m
Fix CCLabelBMFont use texture content scale to calculate font position.
Merge pull request #612 from cocojoe/develop-v3

Fix CCLabelBMFont use texture content scale to calculate font position.
Merge pull request #562 from crmagicxxx/EaseSineActions

Adding Ease Sine actions
Merge pull request #512 from chrene/CCScrollViewDelegate

Adds CCScrollViewDelegate.