BL-374: Export subject headings appropriately for our catalog
DAM-316: Export discover items to the catalog
DAM-322 Fixing activity display
DAM-322: Display a hash
Merge branch 'r5'

Conflicts:
	app/models/archival_video.rb
	features/public/discovery.feature
	features/public/show.feature
	lib/rockhall/discovery.rb
	spec/lib/rockhall/discovery_spec.rb
	spec/models/archival_video_spec.rb
Removing punctuation in subject terms
subject_display field is created solr-side
Post r5 branch merge adjustments