Merge remote-tracking branch 'origin/master'

Conflicts:
	Immunology/src/main/resources/js/admin-page/medCardConstructor.js