Generalize the download wizard
Merge branch 'download'

Conflicts:
	wizard/file_download.xml

Merge the download changes