Follow up on PR review
Merge branch 'avocet/add-new-funder-options' into avocet/form-reshuffle

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js