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
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
Merge pull request #621 from DigitalRuby/develop-v3

Fix for swapBuffers crash and animations issue