use calibrated colors to keep things consistent.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #230 from jtwigg/develop

Develop