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

Conflicts:
	sources/webcore