Make provider country required in import excel
Add space between criteria and id in classification email
Merge branch 'master' into svenska

Conflicts:
	shared/classification-utils.js