cambios pequeños
Merge branch 'final' of https://github.com/dian42/GCadmin into vistas