fixes #97
Merge commit '85314407802157987a8af4c2a39dbf7e42741840' into devel

Conflicts:
	website/templates/website/jurisdictions/AHJ_cqa.jinja
	website/templates/website/jurisdictions/AHJ_cqa_qa.jinja