readded drag columns in list
udpated cfilter 2
Merge branch 'master' of github.com:capensis/canopsis-webcore

Conflicts:
	var/www/canopsis/core/lib/business/cfilter2condition.js