Merge branch 'dev' into 'master'

Dev

See merge request !144

access/middleware.py

@@ -40,9 +40,13 @@ class UpdateActivity(object):
     @staticmethod
     def process_request(request):
         if not request.user.is_anonymous:
-
             user_activity = UserActivity.objects.get(owner=request.user)
-            ip = request.META.get('REMOTE_ADDR', None)
+            x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
+            if x_forwarded_for:
+                ip = x_forwarded_for.split(',')[0]
+            else:
+                ip = request.META.get('REMOTE_ADDR')
+
             if user_activity.ip_list is None:
                 user_activity.ip_list = []