Remove content scale from bitmap font label as it was causing labels to be way too far down
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
Ensure popped scenes directly or via transition will resume.
Fix for swapBuffers crash
Revert "Remove content scale from bitmap font label as it was causing labels to be way too far down"

This reverts commit 7372707981b5f6cddaad68f390e365dfbe2ae0c2.
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
Updated iOS templates
Updated installer version
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
issue #632 : 2x scale on not full screen mode in Mac-retina graphics
Applying jtwigg's fix for pin joints.
Merge pull request #617 from cocojoe/develop-v3

Ensure pushed scenes directly or via transition will resume with pop correctly.
Merge pull request #621 from DigitalRuby/develop-v3

Fix for swapBuffers crash and animations issue
Merge pull request #633 from krazyeom/issue-632

issue #632 : 2x scale on not full screen mode in Mac-retina graphics
Fixed a memory leak with sprite batch nodes.
Fixing CCDirector.viewPort rect when using a 3D projection.
[CCPhysicsBody eachArbiter:] fix and unit tests.