Updating images to be less offensive
Merge pull request #303 from burtlo/fix-decency-in-image

Updating Image to be Less Offensive
new JSB and JS Tests
Merge branch 'develop-v2' of github.com:cocos2d/cocos2d-iphone into develop-v2
New JSB and JS Tests
Merge pull request #1 from cocos2d/develop-v2

Develop v2