Crear Rol,
Listar Roles,
Definir Permisos
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo_project/urls.py