Merge pull request #10 from rockamorales/master

Roberto
Merge pull request #33 from schumy21/master

Schumy_31/01/2013
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #16 from rockamorales/master

Cambio de contrasena corregido