Permisos+
Permisos+
Permisos+
Merge branch 'ValidarRol'

Conflicts:
	Sigma_System/views.py
	templates/fasemodificar.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sigma_System/urls.py
	Sigma_System/views.py
Master