Merge pull request #118 from schumy21/master

schumy 1
Merge pull request #17 from schumy21/master

Schumy
Merge pull request #119 from mackk/master

merge
Merge pull request #120 from schumy21/master

schumy11
- Ordenamiento de menus
Merge branch 'master' of github.com:rockamorales/ClinicaEJB.git
Merge pull request #18 from rockamorales/master

Correccion de errores
Merge pull request #121 from mackk/master

mod
Merge pull request #16 from rockamorales/master

Modificaciones