Merge pull request #813 from jtwigg/develop

SB Pro merge into Develop
Merge branch 'develop' of https://github.com/spritebuilder/SpriteBuilder into develop