Merge fixes and improvements

Server/server.py

@@ -172,7 +172,7 @@ class Server(messaging.Singleton):
 
         if not any([client_addr == addr[0] for client_addr in Client.clients.keys()]):
             client = Client(addr[0])
-            client.buffer_size = self.BUFFER_SIZE
+            client.buffer_size = self.config.server_buffer_size
             logging.info("New client")
         else:
             client = Client.clients[addr[0]]