win msvs
Merge branch 'master' of https://github.com/arcnexus/RedFoX

Conflicts:
	Zona_Pacientes/frmClientes.cpp