ICONIA-FINAL
cosas ignoradas
Merge branch 'iconia-fixing'