Ignore
Merge remote-tracking branch 'origin/André-Selling.Admin'
Merge remote-tracking branch 'origin/master' into Bruno

Conflicts:

	Selling/Selling.Admin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Selling/Selling.Fonte/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Selling/Selling.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'origin/André-Selling.Admin'
Merge remote-tracking branch 'origin/master' into Bruno

Conflicts:

	Selling/Selling.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'origin/master' into Bruno

Conflicts:

	Selling/Selling.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Selling/Selling.v11.suo
Commit ignorar arquivos
Ignorar
Correção LojaId
Merge remote-tracking branch 'origin/André-Selling.Admin'
Evoluções
Commit bruno
Merge remote-tracking branch 'origin/master' into Bruno

Conflicts:
	Selling/Selling.Admin/BootstrapSupport/ViewHelperExtensions.cs
	Selling/Selling.Admin/Controllers/ClienteController.cs
	Selling/Selling.Admin/bin/Selling.Admin.dll
	Selling/Selling.Admin/bin/Selling.Admin.pdb
	Selling/Selling.Admin/bin/Selling.Fontes.dll

	Selling/Selling.Admin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Selling/Selling.Admin/obj/Debug/Selling.Admin.csprojResolveAssemblyReference.cache
	Selling/Selling.Admin/obj/Debug/Selling.Admin.dll
	Selling/Selling.Admin/obj/Debug/Selling.Admin.pdb
	Selling/Selling.Fonte/Entity/Cliente.cs
	Selling/Selling.Fonte/Mapping/ClienteMap.cs
	Selling/Selling.Fonte/bin/Debug/Selling.Fontes.dll
	Selling/Selling.Fonte/bin/Debug/Selling.Fontes.pdb

	Selling/Selling.Fonte/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Selling/Selling.Fonte/obj/Debug/Selling.Fonte.csproj.FileListAbsolute.txt
	Selling/Selling.Fonte/obj/Debug/Selling.Fontes.dll
	Selling/Selling.Fonte/obj/Debug/Selling.Fontes.pdb
	Selling/Selling.Site/Web.config
	Selling/Selling.Site/bin/Selling.Site.dll
	Selling/Selling.Site/bin/Selling.Site.pdb

	Selling/Selling.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	Selling/Selling.Site/obj/Debug/Selling.Site.csprojResolveAssemblyReference.cache
	Selling/Selling.Site/obj/Debug/Selling.Site.dll
	Selling/Selling.Site/obj/Debug/Selling.Site.pdb
	Selling/Selling.v11.suo
Merge remote-tracking branch 'origin/André-Selling.Admin'
Merge remote-tracking branch 'origin/master'
Selling.Admin

Correção de conflito.