Merge branch 'hai' into 'master'

src/GUI/PaintGUI.java

src/client/DrawingUpdate.java

src/client/client.policy

src/remote/IDrawingController.java

src/server/DrawingController.java

src/server/Server.java

src/server/server.policy