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.
Rendering tests.
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
More renderer tests.
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
Adds version number
Revert "Corrects children position in vertical CCLayoutBox"

This reverts commit df9cbba005db9033fb1104c1442ad3f39f15409b.
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Use alpha test shader in the vertex-z test.
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
V3.0.0 release stuff
Private CCDirector.viewportRect property.
Fixed screen mode transitions.
Updated iOS templates
Updated installer version