add cfilter2 started
Merge branch 'NRPUIV2' of github.com:capensis/canopsis into NRPUIV2
Merge branch 'NRPUIV2' of github.com:capensis/canopsis into api-new-rights

Conflicts:
	sources/webcore