update 17:45
update 18:35
update 1118-1
rrrrrrrr

Conflicts:
	SC.WebSite/SC.Business/bin/Debug/SC.Business.dll
	SC.WebSite/SC.Business/bin/Debug/SC.Business.pdb

	SC.WebSite/SC.Business/obj/Debug/SC.Business.csproj.FileListAbsolute.txt
	SC.WebSite/SC.Business/obj/Debug/SC.Business.dll
	SC.WebSite/SC.Business/obj/Debug/SC.Business.pdb
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Business.dll
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Business.pdb
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Data.SqlClient.dll
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Data.SqlClient.pdb
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Data.dll
	SC.WebSite/SC.Data.SqlClient/bin/Debug/SC.Data.pdb

	SC.WebSite/SC.Data.SqlClient/obj/Debug/SC.Data.SqlClient.csprojResolveAssemblyReference.cache
	SC.WebSite/SC.Data.SqlClient/obj/Debug/SC.Data.SqlClient.dll
	SC.WebSite/SC.Data.SqlClient/obj/Debug/SC.Data.SqlClient.pdb
	SC.WebSite/SC.Data/bin/Debug/SC.Business.dll
	SC.WebSite/SC.Data/bin/Debug/SC.Business.pdb
	SC.WebSite/SC.Data/bin/Debug/SC.Data.dll
	SC.WebSite/SC.Data/bin/Debug/SC.Data.pdb
	SC.WebSite/SC.Data/obj/Debug/SC.Data.csproj.FileListAbsolute.txt

	SC.WebSite/SC.Data/obj/Debug/SC.Data.csprojResolveAssemblyReference.cache
	SC.WebSite/SC.Data/obj/Debug/SC.Data.dll
	SC.WebSite/SC.Data/obj/Debug/SC.Data.pdb
	SC.WebSite/SC.Logic/bin/Debug/SC.Logic.dll
	SC.WebSite/SC.Logic/bin/Debug/SC.Logic.pdb

	SC.WebSite/SC.Logic/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SC.WebSite/SC.Logic/obj/Debug/SC.Logic.csproj.FileListAbsolute.txt
	SC.WebSite/SC.Logic/obj/Debug/SC.Logic.dll
	SC.WebSite/SC.Logic/obj/Debug/SC.Logic.pdb
	SC.WebSite/SC.WebSite.v11.suo
	SC.WebSite/SC.WebSite/SC.WebSite.csproj
	SC.WebSite/SC.WebSite/bin/SC.Logic.dll
	SC.WebSite/SC.WebSite/bin/SC.Logic.pdb
	SC.WebSite/SC.WebSite/bin/SC.WebSite.dll
	SC.WebSite/SC.WebSite/bin/SC.WebSite.pdb

	SC.WebSite/SC.WebSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SC.WebSite/SC.WebSite/obj/Debug/SC.WebSite.csprojResolveAssemblyReference.cache
	SC.WebSite/SC.WebSite/obj/Debug/SC.WebSite.dll
	SC.WebSite/SC.WebSite/obj/Debug/SC.WebSite.pdb