Merge pull request #131 from schumy21/master

Schum20
Merge pull request #25 from rockamorales/master

Modificaciones
Colecturia
Merge branch 'master' of github.com:rockamorales/ClinicaEJB.git
Merge pull request #26 from rockamorales/master

Modificaciones consulta medica y otras
Merge pull request #132 from mackk/master

merge
Merge pull request #24 from rockamorales/master

Modificaciones