VR
VR
Merge branch 'Asp.Net' of https://github.com/ATPLERP/GITHUB into Asp.Net

Conflicts:
	ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.dll
	ERPSolution/BLL/bin/Debug/Advantage.ERP.BLL.pdb
	ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.dll
	ERPSolution/BLL/bin/Debug/Advantage.ERP.DAL.pdb
	ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.dll
	ERPSolution/BLL/obj/Debug/Advantage.ERP.BLL.pdb
	ERPSolution/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
	ERPSolution/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache
	ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.dll
	ERPSolution/DAL/bin/Debug/Advantage.ERP.DAL.pdb
	ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.dll
	ERPSolution/DAL/obj/Debug/Advantage.ERP.DAL.pdb
	ERPSolution/DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt
	ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.dll
	ERPSolution/ERPAdvantage/bin/Advantage.ERP.BLL.pdb
	ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.dll
	ERPSolution/ERPAdvantage/bin/Advantage.ERP.DAL.pdb
	ERPSolution/ERPAdvantage/bin/ERPAdvantage.dll
	ERPSolution/ERPAdvantage/bin/ERPAdvantage.pdb
	ERPSolution/ERPAdvantage/bin/WSLibrary.dll
	ERPSolution/ERPAdvantage/bin/WSLibrary.pdb
	ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.csproj.FileListAbsolute.txt
	ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.csprojResolveAssemblyReference.cache
	ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.dll
	ERPSolution/ERPAdvantage/obj/Debug/ERPAdvantage.pdb
	ERPSolution/ERPSolution.v11.suo
	ERPSolution/Libraries/bin/Debug/Libraries.dll
	ERPSolution/Libraries/bin/Debug/Libraries.pdb
	ERPSolution/Libraries/obj/Debug/Libraries.csproj.FileListAbsolute.txt
	ERPSolution/Libraries/obj/Debug/Libraries.dll
	ERPSolution/Libraries/obj/Debug/Libraries.pdb
	ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.dll
	ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.BLL.pdb
	ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.dll
	ERPSolution/WSLibrary/bin/Debug/Advantage.ERP.DAL.pdb
	ERPSolution/WSLibrary/bin/Debug/WSLibrary.dll
	ERPSolution/WSLibrary/bin/Debug/WSLibrary.pdb
	ERPSolution/WSLibrary/obj/Debug/WSLibrary.csproj.FileListAbsolute.txt
	ERPSolution/WSLibrary/obj/Debug/WSLibrary.csprojResolveAssemblyReference.cache
	ERPSolution/WSLibrary/obj/Debug/WSLibrary.dll
	ERPSolution/WSLibrary/obj/Debug/WSLibrary.pdb
VR After ALl
VR