Merge pull request #287 from jtwigg/develop

Develop
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop