Merge branch 'development' into json-generation

Conflicts:
	src/main/webapp/js/classDropdown.js
Merge branch 'json-generation' of https://github.com/InformationIntegrationGroup/Web-Karma into json-generation