Merge branch 'development' into json-generation

Conflicts:
	src/main/webapp/js/classDropdown.js