CCSpriteFrame changes to support content scale of textures.
CCLabelBMFont fixes.
Added Chipmunk as a second target instead of prebuilt static lib
Adds documentation to CCLayout classes
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
CCBReader now sets physic body properties for affectedByGravity and allowsRotation
Updates the project to allow four character literals
Merge pull request #411 from nickskull/develop-v3

Fix the templates for CCNodeColor changes
Fixed some conflicts