SIFD-44 merging from US557 to master, tests pass on local machine
Merge branch 'US557'

Conflicts:
	app/controllers/books_controller.rb
	app/views/book_tiff_representations/show.html.erb
	db/schema.rb