s
t
Merge remote-tracking branch 'origin/Base' into Base

Conflicts:

	Marketplace/Marketplace.Administrator.DTO/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Application.Administrator.dll

	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Application.Administrator.pdb
	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Core.dll
	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Core.pdb
	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Domain.dll
	Marketplace/Marketplace.Administrator/bin/Debug/Marketplace.Domain.pdb

	Marketplace/Marketplace.Administrator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Administrator/obj/Debug/Marketplace.Application.Administrator.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Administrator/obj/Debug/Marketplace.Application.Administrator.csprojResolveAssemblyReference.cache

	Marketplace/Marketplace.Administrator/obj/Debug/Marketplace.Application.Administrator.dll

	Marketplace/Marketplace.Administrator/obj/Debug/Marketplace.Application.Administrator.pdb
	Marketplace/Marketplace.Core/bin/Debug/Marketplace.Core.dll
	Marketplace/Marketplace.Core/bin/Debug/Marketplace.Core.pdb

	Marketplace/Marketplace.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Core/obj/Debug/Marketplace.Core.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Core/obj/Debug/Marketplace.Core.csprojResolveAssemblyReference.cache
	Marketplace/Marketplace.Core/obj/Debug/Marketplace.Core.dll
	Marketplace/Marketplace.Core/obj/Debug/Marketplace.Core.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Application.Administrator.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Application.Administrator.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Core.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Core.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.DistributedServices.API.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.DistributedServices.API.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Domain.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Domain.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Infrastructure.Repository.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Infrastructure.Repository.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Infrastructure.SecurityContext.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Infrastructure.SecurityContext.pdb

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Security.dll

	Marketplace/Marketplace.DistributedServices.API/bin/Marketplace.Security.pdb

	Marketplace/Marketplace.DistributedServices.API/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.DistributedServices.API/obj/Debug/Marketplace.DistributedServices.API.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.DistributedServices.API/obj/Debug/Marketplace.DistributedServices.API.csprojResolveAssemblyReference.cache

	Marketplace/Marketplace.DistributedServices.API/obj/Debug/Marketplace.DistributedServices.API.dll

	Marketplace/Marketplace.DistributedServices.API/obj/Debug/Marketplace.DistributedServices.API.pdb
	Marketplace/Marketplace.Domain/bin/Debug/Marketplace.Core.dll
	Marketplace/Marketplace.Domain/bin/Debug/Marketplace.Core.pdb
	Marketplace/Marketplace.Domain/bin/Debug/Marketplace.Domain.dll
	Marketplace/Marketplace.Domain/bin/Debug/Marketplace.Domain.pdb

	Marketplace/Marketplace.Domain/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Domain/obj/Debug/Marketplace.Domain.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Domain/obj/Debug/Marketplace.Domain.csprojResolveAssemblyReference.cache
	Marketplace/Marketplace.Domain/obj/Debug/Marketplace.Domain.dll
	Marketplace/Marketplace.Domain/obj/Debug/Marketplace.Domain.pdb

	Marketplace/Marketplace.Facade.Cache.CachingControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.ImportExportModule/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Infrastructure.Contracts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Infrastructure.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Core.dll

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Core.pdb

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Domain.dll

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Domain.pdb

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Infrastructure.Repository.dll

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Infrastructure.Repository.pdb

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Security.dll

	Marketplace/Marketplace.Infrastructure.Repository/bin/Debug/Marketplace.Security.pdb

	Marketplace/Marketplace.Infrastructure.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Infrastructure.Repository/obj/Debug/Marketplace.Infrastructure.Repository.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Infrastructure.Repository/obj/Debug/Marketplace.Infrastructure.Repository.csprojResolveAssemblyReference.cache

	Marketplace/Marketplace.Infrastructure.Repository/obj/Debug/Marketplace.Infrastructure.Repository.dll

	Marketplace/Marketplace.Infrastructure.Repository/obj/Debug/Marketplace.Infrastructure.Repository.pdb

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Core.dll

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Core.pdb

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Infrastructure.Repository.dll

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Infrastructure.Repository.pdb

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Infrastructure.SecurityContext.dll

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Infrastructure.SecurityContext.pdb

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Security.dll

	Marketplace/Marketplace.Infrastructure.SecurityContext/bin/Debug/Marketplace.Security.pdb

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/Marketplace.Infrastructure.SecurityContext.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/Marketplace.Infrastructure.SecurityContext.csproj.GenerateResource.Cache

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/Marketplace.Infrastructure.SecurityContext.csprojResolveAssemblyReference.cache

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/Marketplace.Infrastructure.SecurityContext.dll

	Marketplace/Marketplace.Infrastructure.SecurityContext/obj/Debug/Marketplace.Infrastructure.SecurityContext.pdb
	Marketplace/Marketplace.Security/bin/Debug/Marketplace.Core.dll
	Marketplace/Marketplace.Security/bin/Debug/Marketplace.Core.pdb
	Marketplace/Marketplace.Security/bin/Debug/Marketplace.Security.dll
	Marketplace/Marketplace.Security/bin/Debug/Marketplace.Security.pdb

	Marketplace/Marketplace.Security/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Marketplace/Marketplace.Security/obj/Debug/Marketplace.Security.csproj.FileListAbsolute.txt

	Marketplace/Marketplace.Security/obj/Debug/Marketplace.Security.csprojResolveAssemblyReference.cache
	Marketplace/Marketplace.Security/obj/Debug/Marketplace.Security.dll
	Marketplace/Marketplace.Security/obj/Debug/Marketplace.Security.pdb
	Marketplace/Marketplace.v11.suo