Merge remote-tracking branch 'tim/setup' into setup
Merge remote-tracking branch 'tim/setup' into setup
Add the publication profile
Merge origin/master and fix conflicts
Merge tim/setup and fix conflicts
Show a success message when the upload was successful
Merge remote-tracking branch 'hal/avocet/publications-client-api' into upload-success
Hook form up to publication api, show success message when upload finished
Merge remote-tracking branch 'upstream/master' into upload-success

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Merge origin/master and fix conflicts
Follow up on changes
Reset the form and funderscomponent when the upload was successful
Merge branch 'master' of github.com:CUL-DigitalServices/avocet-ui into upload-success
Starting myuploads widget
Merge branch 'publicationProfile' of https://github.com/bp323/3akai-ux into publicationProfile
Fix upload not working
Publication page follow-up
Merge branch 'upload-success' of https://github.com/timdegroote/3akai-ux into upload-success

Conflicts:
	node_modules/oae-avocet/submitpublication/js/submitpublication.js
Hooked up my publications list + general clean up