Implementacao
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orcamento.Controller/bin/x86/Debug/Orcamento.Controller.dll
	Orcamento.Controller/bin/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Controller/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Controller/bin/x86/Debug/Orcamento.Domain.pdb

	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.csprojResolveAssemblyReference.cache
	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.dll
	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Domain/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Domain/bin/x86/Debug/Orcamento.Domain.pdb

	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.csprojResolveAssemblyReference.cache
	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.dll
	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.pdb
	Orcamento.Robo.Web/bin/Orcamento.Robo.Web.dll
	Orcamento.Robo.Web/bin/Orcamento.Robo.Web.pdb

	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.csprojResolveAssemblyReference.cache
	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.dll
	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Controller.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Domain.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Test.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Test.pdb

	Orcamento.Test/obj/x86/Debug/Orcamento.Test.csprojResolveAssemblyReference.cache
	Orcamento.Test/obj/x86/Debug/Orcamento.Test.dll
	Orcamento.Test/obj/x86/Debug/Orcamento.Test.pdb
	WebSimuladorRH.v11.suo
	WebSimuladorRH/bin/Orcamento.Controller.dll
	WebSimuladorRH/bin/Orcamento.Controller.pdb
	WebSimuladorRH/bin/Orcamento.Domain.dll
	WebSimuladorRH/bin/Orcamento.Domain.pdb
	WebSimuladorRH/bin/WebSimuladorRH.dll
	WebSimuladorRH/bin/WebSimuladorRH.pdb

	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.csprojResolveAssemblyReference.cache
	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.dll
	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orcamento.Controller/bin/x86/Debug/Orcamento.Controller.dll
	Orcamento.Controller/bin/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Controller/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Controller/bin/x86/Debug/Orcamento.Domain.pdb

	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.csprojResolveAssemblyReference.cache
	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.dll
	Orcamento.Controller/obj/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Domain/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Domain/bin/x86/Debug/Orcamento.Domain.pdb

	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.csprojResolveAssemblyReference.cache
	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.dll
	Orcamento.Domain/obj/x86/Debug/Orcamento.Domain.pdb
	Orcamento.Robo.Web/bin/Orcamento.Robo.Web.dll
	Orcamento.Robo.Web/bin/Orcamento.Robo.Web.pdb

	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.csprojResolveAssemblyReference.cache
	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.dll
	Orcamento.Robo.Web/obj/Debug/Orcamento.Robo.Web.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Controller.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Controller.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Domain.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Domain.pdb
	Orcamento.Test/bin/x86/Debug/Orcamento.Test.dll
	Orcamento.Test/bin/x86/Debug/Orcamento.Test.pdb

	Orcamento.Test/obj/x86/Debug/Orcamento.Test.csprojResolveAssemblyReference.cache
	Orcamento.Test/obj/x86/Debug/Orcamento.Test.dll
	Orcamento.Test/obj/x86/Debug/Orcamento.Test.pdb
	WebSimuladorRH.v11.suo
	WebSimuladorRH/bin/Orcamento.Controller.dll
	WebSimuladorRH/bin/Orcamento.Controller.pdb
	WebSimuladorRH/bin/Orcamento.Domain.dll
	WebSimuladorRH/bin/Orcamento.Domain.pdb
	WebSimuladorRH/bin/WebSimuladorRH.dll
	WebSimuladorRH/bin/WebSimuladorRH.pdb

	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.csprojResolveAssemblyReference.cache
	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.dll
	WebSimuladorRH/obj/x86/Debug/WebSimuladorRH.pdb
msg