Merge pull request #279 from jtwigg/develop

Develop
Merge pull request #284 from jtwigg/develop

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