Merge branch 'hotfix_use_filter_dsl'
Fixes problem with saving codingjobs
Merge branch 'hotfix_assign_codingjob'
Merge branch 'hotfix_assign_codingjob' into dev
do not simplify terms in a span since space does not mean OR at top level in a span
Merge branch 'hotfix_or_in_span'
Merge branch 'hotfix_or_in_span' into dev
change codebookviews to new layout
added templates for codebook views
added 'add codebook' to new layout
adapt users list to new layout
article url as text field
Merge branch 'hotfix_url_as_text' into dev
fixed associations reference
Merge branch 'dev' into xtas

Conflicts:
	navigator/urls.py