Merge branch 'hotfix_add_n_to_snippets'
set score=False on articlelist to allow caching
Merge branch 'hotfix_articlelist_no_score'
use constant score query for highlighting
Merge branch 'hotfix_articlelist_no_score'
Merge commit '76e0c2e832282d4d14e3fbf9620d18ce6596bc89' from hotfix_articlelist_no_score into dev
Add default label, extra labels to improt/export codebook
added update codebook option, labels now update existing label
Merge branch 'hotfix_codebook_eximport_language'
Merge branch 'hotfix_codebook_eximport_language' into dev

Conflicts:
	navigator/views/codebook_views.py
add access to underyling es.search
fix view name bug
stub code for progress
fix view name bug
Added first somewhat useful progress
Partly reverted erroneous merge (3ab5aeb5443e274d70c5bf455e7e058a14c48626)
stub code for progress
Added first somewhat useful progress
Merge branch 'feature_progress' of github.com:amcat/amcat into feature_progress
progress indication for tables