Fix grayscale images crashing.  Not perfect, but at least now it doesn't crash. #348
Merge branch 'develop' of https://github.com/SpriteBuilder/SpriteBuilder into develop
Test to publish a greyscale image added.
Merge branch 'develop' into refactor/pull_request_#557_greyscale_publish_test_added
Added some missing assertions :)
Merge pull request #1110 from NickyWeber/refactor/pull_request_#557_greyscale_publish_test_added

Refactor/pull request #557 greyscale publish test added
Merge pull request #557 from SteveKanter/develop

Fix grayscale images crashing. Looks good. Thanks!
Bumps cocos2D