root log level
Merge branch 'master' of github.com:amcat/amcat
Merge branch 'master' of github.com:amcat/amcat
Merge branch 'master' of github.com:amcat/amcat
Merge branch 'master' of github.com:amcat/amcat
added raw_pdf uploadscript, pdfscraper edits
removed raw_pdf, enabled plain text uploader to handle pdf instead
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' into dev

Conflicts:
	amcat/tools/amcates.py