Merge branch 'master' into guardian

# Conflicts:
#	Pipfile
#	Pipfile.lock
#	passbook/admin/views/invitations.py
#	passbook/admin/views/policy.py
#	passbook/admin/views/providers.py
#	passbook/admin/views/sources.py
#	passbook/admin/views/users.py

passbook/admin/views/factors.py

@@ -28,6 +28,7 @@ class FactorListView(LoginRequiredMixin, PermissionListMixin, ListView):
     template_name = 'administration/factor/list.html'
     permission_required = 'passbook_core.view_factor'
     ordering = 'order'
+    paginate_by = 40
 
     def get_context_data(self, **kwargs):
         kwargs['types'] = {