Fix - Multi usuario - poliza
Merge branch 'integration' of https://github.com/salej1/blackstar-dev into integration