Merge branch 'hotfix_new_bzk_upload_format'
Merge branch 'hotfix_new_bzk_upload_format'
fix #3 bzk upload
Merge branch 'hotfix_new_bzk_upload_format'
Check if an article exists before adding it
Merge branch 'hotfix_add_Articles_check_exist'
replace scraper overview by (ugly) webscript call
add weekly scrapers, improve table sorting, allow articlesets from other projecst in html aggregation
cherry pick 5a3e348a9657e7a29e0e60becfaafed284618d3b
Merge branch 'hotfix_scraper_overview'
Merge branch 'hotfix_spss'
Merge branch 'hotfix_scraper_overview'
fixed bzk html uploader
Included development build icon
hotfixed bzk html upload
exclude() needs keyword arguments
Merge branch 'hotfix_clean_article_ids' into dev

Conflicts:
	amcat/models/articleset.py
	api/webscripts/export_aggregation.py