Fixed conflicts
Merge pull request #45 from rbarrera87/45-Fix-The-Index-Group-View

Corregir la vista index de grupos