Asignar Rol
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo_project/urls.py