Arreglos menores para paso de mensajes a templates
Merge remote-tracking branch 'github/Ramos6' into Agu2
Merge remote-tracking branch 'github/Zalimben6' into Agu2

Conflicts:
	administrarFases/views.py
	administrarLineaBase/views.py
	templates/fase/workPhase.html
Mejora de decoradores de seguridad. Roles y permisos actualizados.
Merge remote-tracking branch 'origin/Agu2' into Ramos6

Conflicts:
	administrarFases/views.py
	administrarItems/views.py
	administrarLineaBase/models.py
	administrarLineaBase/views.py
	administrarRolesPermisos/views.py
	docs/_build/doctrees/administrarFases.doctree
	docs/_build/doctrees/administrarProyectos.doctree
	docs/_build/doctrees/administrarUsuarios.doctree
	docs/_build/doctrees/autenticacion.doctree
	docs/_build/doctrees/environment.pickle
	docs/_build/doctrees/index.doctree
	docs/_build/doctrees/is2.doctree
	docs/_build/doctrees/manage.doctree
	docs/_build/doctrees/modules.doctree
	docs/_build/doctrees/zar.doctree
	templates/fase/workPhase.html
Listo para la iteracion 6