Merge branch 'hotfix_codebook_eximport_language'
add FOCUS to doc count line
Merge branch 'hotfix_ln' into dev
fix article list / snippets
Replaced summary with list of snippets
make elastic port config option
Merge branch 'dev' into feature_progress

Conflicts:
	api/webscripts/show_articlelist.py
Merge branch 'feature_progress' of github.com:amcat/amcat into feature_progress