Merge pull request #154 from jtwigg/develop

Develop
Merge pull request #155 from jtwigg/develop

Develop
Adds new Icons and default images to default project
Updates to latest Cocos2d
Updates to documentation
add select pngs back to project.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj