Fix the typo
Typo in the note.
django.conf.urls.defaults deprecated
Tests for FAQs uploaded
Merge branch 'develop' of github.com:emory-libraries/voyages into develop
The FAQ page should display No Results if nothing is returned.
"No results" to glossary and another tests
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop

Conflicts:
	voyages/apps/help/tests.py
Deleted merging stuff
Hotfix in help tests