Fixed #107
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	search/views.py
Merge branch 'development'