Merge pull request #29 from rockamorales/master

Modificaciones
Colecturia
Merge pull request #136 from mackk/master

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

Modificaciones