Updating Chipmunk reference
Added retina/pad/phone device detection logic when compiling with Apportable
Ensured that a shader program is set when trying to update cclabelttf texture on older version of ios (<6). Note: this is required for apportable.
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
cleanup CCTransitions to avoid leaking.
CCPhysics retain cycle bug fix + unit tests.
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Make CCPhysicsNode debug drawing more visible.
Clamp float colors when converting to fixed point.
Fix #451
Fixed OSX template warning
Fixed OSX template release errors
Merge pull request #492 from nickskull/develop-v3

Fix #451
Fixed buttons not showing highlighted and disabled states
More logic scene setup in template
CCButton setColor Helper Issue #452
AppleDoc Setting Tweaks
Removed BridgeSupport Stubs
CCActionCatmullRom Documentation Tweaks
CCActionProgressTimer Documentation Tweaks
CCActionTween Documentation Tweaks
Merge remote-tracking branch 'upstream/develop-v3' into develop-v3
Transition renaming for clarity
Merge pull request #494 from cocojoe/develop-v3

Documentation Tweaks, Retired BridgeSupport, Issue Fix
Fixed start and resume for scenes during transitions