cambios varios
Merge remote-tracking branch 'origin/master'

Conflicts:
	bnxMaqFrontera.Tests/bin/Debug/bnxMaqFrontera.Tests.dll
	bnxMaqFrontera.Tests/bin/Debug/bnxMaqFrontera.dll
	bnxMaqFrontera.Tests/bin/Debug/bnxMaqFrontera.pdb

	bnxMaqFrontera.Tests/obj/Debug/bnxMaqFrontera.Tests.csproj.FileListAbsolute.txt

	bnxMaqFrontera.Tests/obj/Debug/bnxMaqFrontera.Tests.csprojResolveAssemblyReference.cache
	bnxMaqFrontera.Tests/obj/Debug/bnxMaqFrontera.Tests.dll
	bnxMaqFrontera.v11.suo
	bnxMaqFrontera/Views/Unidades/Main.cshtml
	bnxMaqFrontera/bin/bnxMaqFrontera.dll
	bnxMaqFrontera/bin/bnxMaqFrontera.pdb
	bnxMaqFrontera/bnxMaqFrontera.csproj.user
	bnxMaqFrontera/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	bnxMaqFrontera/obj/Debug/bnxMaqFrontera.csproj.FileListAbsolute.txt
	bnxMaqFrontera/obj/Debug/bnxMaqFrontera.csproj.GenerateResource.Cache

	bnxMaqFrontera/obj/Debug/bnxMaqFrontera.csprojResolveAssemblyReference.cache
	bnxMaqFrontera/obj/Debug/bnxMaqFrontera.dll
	bnxMaqFrontera/obj/Debug/bnxMaqFrontera.pdb