Compatibility fix with newer Django version.
Remove project-specific code to make generic again.
Merge commit '4339528e8e1401f17c829dd7efb54ad1d5cd41c7'

Conflicts:
	search.py
	tests.py
	urls.py