Merge pull request #48 from mackk/master

admin
Merge pull request #49 from schumy21/master

schumy 1
Merge pull request #22 from rockamorales/master

Modificaciones Schumy
Merge pull request #50 from mackk/master

merge
Linea XD
Merge pull request #51 from mackk/master

mod
Merge pull request #52 from schumy21/master

schumy11
Linea XD
- Orden de menus
- No mostraba la lista de citas al darle ver todas
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #23 from rockamorales/master

Correccion de errores
Linea XD
Merge pull request #53 from mackk/master

mod
Merge pull request #19 from rockamorales/master

mod