asd
Merge branches 'master' and 'master' of https://github.com/ChrisRunn/ERP-Integration-WS

Conflicts:
	ERPIntegrationWebService/ERPIntegrationWebService.csproj
	ERPIntegrationWebService/Service References/ERPIntegrationWSReference/Reference.cs
	ERPIntegrationWebService/bin/ERPIntegrationWebService.dll
	ERPIntegrationWebService/bin/ERPIntegrationWebService.pdb
	ERPIntegrationWebService/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	ERPIntegrationWebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ERPIntegrationWebService/obj/Debug/ERPIntegrationWebService.dll
	ERPIntegrationWebService/obj/Debug/ERPIntegrationWebService.pdb
	ERPIntegrationWebService/obj/Debug/TempPE/Service References.ERPIntegrationWSReference.Reference.cs.dll