filter dsl
improved filter dsl, seems to be working right
switch aggregate query to filter_dsl

Conflicts:
	amcat/tools/amcates.py
Merge branch 'hotfix_use_filter_dsl'