Merging master with isaac code

.idea/workspace.xml

src/GUI/ApplicationMain.java

src/GUI/ChatScreen.form

src/GUI/DrawingArea.java

src/GUI/MenuBar.java

src/GUI/PaintGUI.java

src/GUI/StartScreen.form

src/GUI/StartScreen.java

src/GUI/ToolBar.java

src/client/Client.java

src/client/ClientUpdate.java

src/client/DrawingUpdate.java

src/client/EncryptionUpdate.java

src/client/client.policy

src/remote/IClientController.java

src/remote/IDrawingController.java

src/remote/IDrawingUpdate.java

src/remote/IEncryptionUpdate.java

src/server/ClientController.java

src/server/DrawingController.java