RE
Merge branch 'master' of github.com:montegava/rental

Conflicts:
	DAL/bin/Debug/RentalCommon.dll
	ImageProcessing/bin/Debug/ImageProcessing.dll
	ImageProcessing/bin/Debug/ImageProcessing.pdb
	ImageProcessing/obj/Debug/ImageProcessing.dll
	ImageProcessing/obj/Debug/ImageProcessing.pdb
	RentalCMS/Properties/PublishProfiles/amiravrn.pubxml.user
	RentalCMS/__2.txt
	RentalCMS/bin/DAL.dll
	RentalCMS/bin/RentalCMS.dll
	RentalCMS/bin/RentalCommon.dll
	RentalCMS/bin/SmartControls.dll
	RentalCommon/bin/Debug/RentalCommon.dll
	RentalCore/RentalCore.cs
	RentalCore/bin/Debug/DAL.dll
	RentalCore/bin/Debug/RentalCommon.dll
	RentalCore/bin/Debug/RentalCore.dll
	rec/bin/Debug/rec.exe
	rec/bin/Debug/rec.pdb