Merge branch 'master' into feature_annotator_ui

Conflicts:
	navigator/views/articleset_views.py