uiv2 last changes integration
Merge branch 'NRPUIV2' of https://github.com/capensis/canopsis into NRPUIV2