directorio rol
Merge branch 'pre-master'