Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

Fix some tests.

corputils/managers.py

@@ -8,24 +8,20 @@ class CorpStatsQuerySet(models.QuerySet):
             return self
 
         try:
-            assert user.profile.main_character
             char = user.profile.main_character
+            assert char
             # build all accepted queries
-            queries = []
+            queries = [models.Q(token__user=user)]
             if user.has_perm('corputils.view_corp_corpstats'):
                 queries.append(models.Q(corp__corporation_id=char.corporation_id))
             if user.has_perm('corputils.view_alliance_corpstats'):
                 queries.append(models.Q(corp__alliance__alliance_id=char.alliance_id))
 
             # filter based on queries
-            if queries:
-                query = queries.pop()
-                for q in queries:
-                    query |= q
-                return self.filter(query)
-            else:
-                # not allowed to see any
-                return self.none()
+            query = queries.pop()
+            for q in queries:
+                query |= q
+            return self.filter(query)
         except AssertionError:
             return self.none()