Merge remote-tracking branch 'culds/master' into avocet/form-reshuffle
Shuffle form to match latest design changes.

Some fields have been re-ordered. The copyright radios have been
replaced with a checkbox asking if the user will use the Cambridge
Authors' Addendum.
Add addendum modal info widget & remove unused apc and copyright widgets
Merge branch 'avocet/add-new-funder-options' into avocet/form-reshuffle

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Merge branch 'avocet/add-new-funder-options' into avocet/form-reshuffle

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Minor form ordering issues