CCPhysicsBody.type tests and a fix.
merging
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Some color fixes.
Removes debug code
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3