made haystack-2.0.0beta compatible

Conflicts:
	cms_search/search_indexes.py