Committed changes where there were conflicts

Signed-off-by: cantleyc <chris.cantley@claytonhomes.com>
Continued addition of leads model methods

Signed-off-by: cantleyc <chris.cantley@claytonhomes.com>
Merge branch 'master' of https://github.com/myersb/IndiPhotoUp

Signed-off-by: cantleyc <chris.cantley@claytonhomes.com>

Conflicts:
	DealerInventoryImageManager/MainStoryboard.storyboard