Merge branch 'master' of https://github.com/WSULib/digitalcollections
Merge branch 'master' of https://github.com/WSULib/digitalcollections

Conflicts:
	templates/display-more-info.htm