libreria+ lista amigos
Merge remote-tracking branch 'origin/Aitor'