Merge branch 'upload-progress' into visual-implementation

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