LERGO-217 - fixed.
Merge branch 'develop' of https://github.com/lergo/lergo-ui into develop