Merge branch 'refs/heads/develop' into convert-to-ARC

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
	SpriteBuilder/ccBuilder/UsageManager.m
	SpriteBuilder/ccBuilder/en.lproj/MainMenu.xib

Conflicts:
	SpriteBuilder/ccBuilder/ResourceManagerPreviewView.h
	SpriteBuilder/ccBuilder/ResourceManagerPreviewView.m
	SpriteBuilder/libs/cocos2d-iphone
.gitignore SPRITEKITPROJECTNAME.zip