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

Conflicts:
	Aplicacion Desktop/Clinica Frba.suo