LIMS-1430 Reestructuracion to solve some problems
Merge pull request #1343 from Espurna/hotfix/next

LIMS-1430 Reestructuracion to solve some problems