experimental search branch
adding haystack
Merge branch 'search' into dev

Conflicts:
	project/settings/base.py
	project/urls.py
	requirements/base.txt