solucionados los conflictos
Merge branch 'bugs_styles' into develop