Test haystack
Haystack highlight working

Merge branch 'haystack-test' into develop

Conflicts:
	voyages/apps/help/urls.py
	voyages/apps/help/views.py