Update form copy
Merge branch 'avocet/form-reshuffle' of https://github.com/ucamhal/3akai-ux into microcopy

Conflicts:
	avocet/css/avocet.base.css
	node_modules/oae-avocet/myuploads/myuploads.html
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into microcopy

Conflicts:
	node_modules/oae-avocet/submitpublication/submitpublication.html
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into microcopy

Conflicts:
	avocet/css/avocet.base.css
Update with latest content changes
Merge branch 'microcopy' of https://github.com/timdegroote/3akai-ux into microcopy