Add test cases for aggregate.aggregate
Merge branch 'feature_query_rewrite' into feature_query_rewrite_datatable

Conflicts:
	amcat/tools/tests/aggregate.py