Merge pull request #817 from jtwigg/develop

Add Effects to SpriteBuilder.
update cocos2d version.