Merging isaac's code with master, conflicts solved

.idea/workspace.xml

out/production/infinitymonkeys/GUI/DrawingArea$1.class

out/production/infinitymonkeys/GUI/DrawingArea$Mode.class

out/production/infinitymonkeys/GUI/DrawingArea.class

out/production/infinitymonkeys/client/ChatUpdate.class

out/production/infinitymonkeys/client/DrawingUpdate.class

out/production/infinitymonkeys/client/EncryptionUpdate.class

out/production/infinitymonkeys/remote/IChatController.class

out/production/infinitymonkeys/remote/IChatUpdate.class

...roduction/infinitymonkeys/remote/IDrawingController.class

out/production/infinitymonkeys/remote/IDrawingUpdate.class

out/production/infinitymonkeys/server/ChatController.class

...production/infinitymonkeys/server/DrawingController.class

out/production/infinitymonkeys/server/MySharedKey.class

out/production/infinitymonkeys/server/User.class

out/production/infinitymonkeys/server/server.policy

resources/circle.png

resources/eraser.png

resources/freehand.png

resources/line.png