Merge branch 'master' into federate

cas_server/utils.py

@@ -29,6 +29,11 @@ except ImportError:
     from urllib.parse import urlparse, urlunparse, parse_qsl, urlencode
 
 
+def context(params):
+    params["settings"] = settings
+    return params
+
+
 def JsonResponse(request, data):
     data["messages"] = []
     for msg in messages.get_messages(request):