cocos2d upgrade.
Merge pull request #317 from jtwigg/develop

cocos2d upgrade.