update cocos2d
Merge pull request #231 from jtwigg/develop

update cocos2d