Merge branch 'master' into feat/personalised-ical-feed

Author: SilasPeters

app/views/admin/activities/index.html.haml

@@ -27,7 +27,7 @@
                       - elsif activity.group.committee?
                         %span.badge.badge-success= activity.group.name.upcase
                       - else
-                        %span.label.badge-warning= activity.group.name.upcase
+                        %span.badge.badge-warning= activity.group.name.upcase
                   - else
                     %td
                       %span