Comite
Merge branch 'Val_Rol_2'

Conflicts:
	Sigma_System/vistas/ProyectoViews.py
Comite
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sigma_System/vistas/ProyectoViews.py