caca
Merge remote-tracking branch 'origin/master'

Conflicts:

	Controladora/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	DAO/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Entidades/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsFormsApplication1.suo

	WindowsFormsApplication1/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	WindowsFormsApplication1/obj/x86/Debug/WindowsFormsApplication1.csproj.FileListAbsolute.txt