Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/catalog_controller.rb
	app/models/datastreams/opgave_mods_datastream.rb
missing ' in each