Merge branch 'hai' into 'master'

src/GUI/ChatScreen.form

src/GUI/ChatScreen.java

src/GUI/DrawingArea.java

src/client/ChatUpdate.java

src/client/Client.java

src/client/DrawingUpdate.java

src/client/EncryptionUpdate.java

src/remote/IChatController.java

src/remote/IChatUpdate.java

src/remote/IClientController.java

src/remote/IDrawingController.java

src/remote/IDrawingUpdate.java

src/server/ChatController.java

src/server/ClientController.java

src/server/DrawingController.java

src/server/MySharedKey.java

src/server/Server.java

src/server/User.java