pull
Agrega ajustes a solicitudes de usuario
Merge branch 'desarrollo' of https://github.com/luisincrespo/quirofanos-cmsb into desarrollo

Conflicts:
	quirofanos_cmsb/models.py