Fix for django 1.5

from django.views.generic.list_detail import object_list will not work
anymore
Merge remote-tracking branch 'henkvos/master'
Fixed picked from EnTeQuAk's work on python3 port.
Made the test 1.3 and 1.5 compatible.
Removed unneeded comments.
Merge branch 'linovia-master'