Merge pull request #122 from schumy21/master

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

colecturia
Merge pull request #123 from schumy21/master

schumy13
Merge pull request #20 from rockamorales/master

Colecturia