Commiteando las giladas autogeneradas para ver si compila.
Merge Javi y Juan. Varias cosas *al pedo*

Conflicts:
	Clinica Frba.suo
	Clinica Frba/bin/Debug/Clinica Frba.exe
	Clinica Frba/bin/Debug/Clinica Frba.pdb
	Clinica Frba/bin/Debug/FormsBase.dll
	Clinica Frba/bin/Debug/FormsBase.pdb
	Clinica Frba/obj/Debug/Clinica Frba.csproj.FileListAbsolute.txt
	Clinica Frba/obj/Debug/Clinica Frba.csproj.GenerateResource.Cache
	Clinica Frba/obj/Debug/Clinica Frba.exe
	Clinica Frba/obj/Debug/ResolveAssemblyReference.cache
	FormsBase/bin/Debug/FormsBase.dll
	FormsBase/bin/Debug/FormsBase.pdb
	FormsBase/obj/Debug/FormsBase.dll
	FormsBase/obj/Debug/FormsBase.pdb
	FormsBase/obj/Debug/LibFormsBase.csproj.FileListAbsolute.txt
	FormsBase/obj/Debug/LibFormsBase.csproj.GenerateResource.Cache
	FormsBase/obj/Debug/Refactor/FormsBase.dll