Fix for django 1.5

from django.views.generic.list_detail import object_list will not work
anymore
Merge remote-tracking branch 'henkvos/master'