Merge branch 'frontend-perfiles'
Arregla unos problemas del merge.
Merge branch 'master' into frontend-perfiles