remove log.
Update cocos2d.
Fix project settings.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
revert spritekit change.
Merge pull request #325 from jtwigg/develop

Develop