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

Conflicts:
	ERPIntegrationWebService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache