re added columns drag and drop
Merge branch 'NRPUIV2' of github.com:capensis/canopsis into NRPUIV2