Merge branch 'master' of github.com:jezdez/code-of-conduct into jezdez-master

Conflicts:
	data/supporters.json

Author: hagenburger

data/supporters.json

@@ -80,6 +80,25 @@
           "email": "[email protected]"
         }
       ]
+    },
+    {
+      "name": "Django User Group Berlin (djub)",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://www.meetup.com/django-user-group-berlin/",
+      "twitter": "",
+      "contacts": [
+        {
+          "name": "Jannis Leidel",
+          "phone": "+49 151 58560663",
+          "email": "[email protected]"
+        },
+        {
+          "name": "Stephan Jäkel",
+          "phone": "+49 151 50669468",
+          "email": "[email protected]"
+        }
+      ]
     }
   ],
   "conferences": [