collision types added to CCBReader.
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3