adding Grupo and changing Usuario with ManyToMany map with Grupo
Merge branch 'master' of github.com:echevreuil/catalogo