Fixing images and migration
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop

Conflicts:
voyages/apps/resources/admin.py
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop

Conflicts:
	voyages/apps/resources/admin.py