Merge pull request #29 from mackk/master

merge
Merge pull request #30 from schumy21/master

ultimas modificaciones
Merge pull request #31 from mackk/master

Mauro update
Merge pull request #32 from schumy21/master

ultimoSC
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #15 from rockamorales/master

Roberto