Merge branch 'feature_annotator_ui' into feature_annotator_prefetch

Conflicts:
	annotator/static/js/annotator/annotator.js