Add welcome message with dummy content
Remove unnecesary whitespace
Merge remote-tracking branch 'upstream/master' into welcome-message

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into welcome-message
PR Follow-up
Add the content for the welcome message
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into welcome-message

Conflicts:
	avocet/css/avocet.base.css
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Merge branch 'welcome-message' of https://github.com/timdegroote/3akai-ux into welcome-message
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into microcopy

Conflicts:
	avocet/css/avocet.base.css