Test FAQs reuploaded
+ testsettings file uploaded
Merge branch 'develop' of github.com:emory-libraries/voyages into develop

Conflicts:
	voyages/apps/help/tests.py