added content data stream
added file upload
added file upload
Merge branch 'master' of github.com:Det-Kongelige-Bibliotek/DIAS

Conflicts:
	app/views/papers/_form.html.erb