Merge remote-tracking branch 'origin/master'

# Conflicts:
#	world.py

AI.py

@@ -1,8 +1,17 @@
+from random import Random
+
+
 class AI:
 
     def pick(self, world):
+        self.r = Random()
         print("pick")
-        world.choose_deck([1, 2, 3 , 4])
+        world.choose_deck([1, 2, 3, 4])
+        print(world.put_unit(type_id=1, path=world.map.paths[self.r.randint(1, 4)]))
+        if len(world.player.units) > 0:
+            print(world.player.units[0].cell)
 
     def turn(self, world):
         print("turn")
+        if len(world.player.units) > 0:
+            print(world.player.units[0].cell)

controller.py

@@ -1,4 +1,3 @@
-import json
 import os
 import sys
 import threading
@@ -26,7 +25,6 @@ def __init__(self):
 
     # change with switcher
     def handle_message(self, message):
-        print("got message")
         if message[ServerConstants.KEY_TYPE] == ServerConstants.MESSAGE_TYPE_INIT:
             self.world._handle_init_message(message[ServerConstants.KEY_INFO])
             new_world = World(world=self.world)
@@ -65,7 +63,6 @@ def run():
                     World.LOG_FILE_POINTER.write('------send message to server-----\n ' + message.__str__())
                 self.network.send(message)
 
-
         Thread(target=run, daemon=True).start()
 
     def read_settings(self):