:maj: webcore
Merge branch 'NRPUIV2' of http://github.com/capensis/canopsis into NRPUIV2