Merge pull request #126 from schumy21/master

Schumy14
Merge pull request #127 from mackk/master

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

Modificaciones
Merge pull request #128 from schumy21/master

Schumy17ABR AM
Merge pull request #22 from rockamorales/master

Mas modificaciones