Merge branch 'master' of github.com:rockamorales/ClinicaEJB.git
Merge pull request #115 from mackk/master

done
Merge pull request #13 from rockamorales/master

Merge all
Merge branch 'master' of github.com:rockamorales/ClinicaEJB.git
Merge pull request #116 from schumy21/master

schumy
Merge branch 'master' of github.com:rockamorales/ClinicaEJB.git
Merge pull request #16 from rockamorales/master

Modificaciones a consulta