Merge branch 'master' of https://github.com/MaddTheSane/ResKnife

Conflicts:
	.gitignore
	Cocoa/Classes/ResourceDataSource.m
	Cocoa/English.lproj/InfoPlist.strings
	Cocoa/Info.plist
	Cocoa/cy.lproj/Localizable.strings
	ResKnife.xcodeproj/project.pbxproj
Adding new icons from the old Carbon app.