udpate cfilter2 added drag and drop
Merge branch 'master' of github.com:capensis/canopsis-webcore

Conflicts:
	var/www/canopsis/uibase/lib/loaders/components.js