d
Merge branch 'master' of github.com:Grupo-Ughelli-Lisnichuk-IS2/PMS

Conflicts:
	PMS/settings.py
	PMS/settings.pyc
	PMS/urls.py
arreglos en votaciones, agregar ver detalle solicitud