Merge branch 'master' into 'develop'

# Conflicts:
#   putsch.py

putsch.py

@@ -75,7 +75,7 @@ class Boooob(ircbot.SingleServerIRCBot):
         self.ingame = 0
         self.phase = 0
         self.repet = 0
-        # self.admin = ["Titch","Cloud"]
+        self.admin = [] # ["Titch","Cloud"]
 
         self.phase2trig = 1
         self.phase2 = 0
@@ -168,7 +168,7 @@ class Boooob(ircbot.SingleServerIRCBot):
                             serv.invite(personne, "#lg_putsch_loups")
                         else:
 		            if f == "villageois":
-                                self.villageois.append(f)
+                            	self.villageois.append(personne)
                             setattr(self, f, personne)
                         self.phase2 = self.phase2 + 1
                         break