Summary
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusinessLayer/bin/Debug/BusinessLayer.pdb
	BusinessLayer/bin/Debug/DataAccessLayer.pdb

	BusinessLayer/obj/Debug/BusinessLayer.csprojResolveAssemblyReference.cache
	BusinessLayer/obj/Debug/BusinessLayer.pdb
	DataAccessLayer/bin/Debug/DataAccessLayer.pdb
	DataAccessLayer/obj/Debug/DataAccessLayer.pdb
	Manali/bin/BusinessLayer.pdb
	Manali/bin/DataAccessLayer.pdb
	Manali/bin/Manali.dll
	Manali/bin/Manali.pdb
	Manali/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Manali/obj/Debug/Manali.csprojResolveAssemblyReference.cache
	Manali/obj/Debug/Manali.dll
	Manali/obj/Debug/Manali.pdb