Merge branch 'master' of https://github.com/courseportal/coursePortal
minor fix
merge
Conflicts:
	haystack/templates/search/result_object.html
	haystack/templates/search/search.html
	haystack/templates/search/searchGeneral.html
	pybb/templates/pybb/topic_list.html
	web/models.py