Merge branch 'breveprojekt_merge'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/works.js
	app/controllers/catalog_controller.rb
	app/controllers/works_controller.rb
	app/helpers/view_helper.rb
	app/models/datastreams/authority_desc_metadata.rb
	app/models/datastreams/work_desc_metadata.rb
	app/models/work.rb
	app/views/authority_metadata_units/edit.html.erb
	app/views/authority_metadata_units/new.html.erb
	app/views/authority_metadata_units/show.html.erb
	config/locales/adl.da.yml
	config/locales/adl.en.yml
	config/routes.rb
	lib/tasks/sifd_tasks.rake