copy paste mixup.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Pin joints fixups.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
add type to writer. 
update cocos2d.
max min onscreen working.
improve refreshing of data.
rename enums
Max Min handles worknig.
update cocos2d
Merge pull request #296 from jtwigg/develop

Develop
Merge pull request #295 from KoboldKit/develop-steffen

SK: load image from atlas, various bugfixes, new icons
Merge branch 'develop' of github.com:apportable/SpriteBuilder into develop-steffen

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj