receta
Merge branch 'master' of https://github.com/breuer/gestion

Conflicts:
	Aplicacion Desktop/Clinica Frba.suo
	Aplicacion Desktop/Clinica Frba/Base/DataSession.cs
	Aplicacion Desktop/Clinica Frba/FormMain.cs
	migration_script_2c2013.sql