Merge branch 'master' of https://github.com/myersb/DealerInventoryImageManager

Conflicts:
	DealerInventoryImageManager.xcodeproj/project.pbxproj