Merge with fixes from navigation
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop

Conflicts:
	voyages/apps/voyage/views.py