Merge pull request #11 from rockamorales/master

Cambio de contrasena corregido
Merge pull request #34 from mackk/master

merge
Merge pull request #35 from schumy21/master

Schumy_01/02/2013
Merge pull request #36 from schumy21/master

Actualizacion 04022013 SCHUMY
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #37 from schumy21/master

Modificaciones
Merge pull request #12 from rockamorales/master

Modificaciones
merge