Cambios sabado pre - release
Fix para reportes
Merge branch 'sprint7-1-lb' into develop
merge