pull
Merge branch 'desarrollo' of github.com:luisincrespo/quirofanos-cmsb into desarrollo

Conflicts:
	plan_quirurgico/templates/plan_quirurgico/calendario.html
	plan_quirurgico/views.py
Agrega cambio de contrasena completo