zr\
Merge branch 'master' of https://github.com/1184424167/edi-

Conflicts:
	EdiFabricFramework4.1/Solution/Definitions/bin/Debug/EdiFabric.Definitions.dll
	EdiFabricFramework4.1/Solution/Definitions/bin/Debug/EdiFabric.Definitions.pdb
	EdiFabricFramework4.1/Solution/Definitions/obj/Debug/EdiFabric.Definitions.dll
	EdiFabricFramework4.1/Solution/Definitions/obj/Debug/EdiFabric.Definitions.pdb
	EdiFabricFramework4.1/Solution/EdiFabric.v12.suo
	EdiFabricFramework4.1/Solution/Framework/bin/Debug/EdiFabric.Framework.dll
	EdiFabricFramework4.1/Solution/Framework/bin/Debug/EdiFabric.Framework.pdb
	EdiFabricFramework4.1/Solution/Framework/obj/Debug/EdiFabric.Framework.dll
	EdiFabricFramework4.1/Solution/Framework/obj/Debug/EdiFabric.Framework.pdb
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.Definitions.dll
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.Definitions.pdb
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.Framework.dll
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.Framework.pdb
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.SampleApplication.exe
	EdiFabricFramework4.1/Solution/SampleApplication/bin/Debug/EdiFabric.SampleApplication.pdb
	EdiFabricFramework4.1/Solution/SampleApplication/obj/x86/Debug/EdiFabric.SampleApplication.exe
	EdiFabricFramework4.1/Solution/SampleApplication/obj/x86/Debug/EdiFabric.SampleApplication.pdb
	EdiFabricFramework4.1/Solution/SampleApplication/obj/x86/Debug/SampleApplication.csprojResolveAssemblyReference.cache
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Definitions.dll
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Definitions.pdb
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Framework.dll
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Framework.pdb
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Tests.dll
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Tests.pdb
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Validators.dll
	EdiFabricFramework4.1/Solution/Tests/bin/Debug/EdiFabric.Validators.pdb
	EdiFabricFramework4.1/Solution/Tests/obj/Debug/EdiFabric.Tests.dll
	EdiFabricFramework4.1/Solution/Tests/obj/Debug/EdiFabric.Tests.pdb
	EdiFabricFramework4.1/Solution/Tests/obj/Debug/Tests.csprojResolveAssemblyReference.cache