remove out dated get_query_set() with new get_queryset() function
Merge remote-tracking branch 'origin/master'