Fixed merge conflicts:
	app/controllers/works_controller.rb
	app/views/works/show.html.erb
	spec/helpers/digitisation_helper_spec.rb
	spec/helpers/manifestations_helper_spec.rb