Merge branch 'master' into 'hai'

...itymonkeys/com/intellij/uiDesigner/core/SupportCode.class

...n/infinitymonkeys/com/intellij/uiDesigner/core/Util.class

...tymonkeys/com/intellij/uiDesigner/core/VerticalInfo.class

out/production/infinitymonkeys/remote/IChatController.class

out/production/infinitymonkeys/remote/IChatUpdate.class

...ion/infinitymonkeys/remote/IClientController$Action.class

...production/infinitymonkeys/remote/IClientController.class

...duction/infinitymonkeys/remote/IClientUpdate$Action.class

out/production/infinitymonkeys/remote/IClientUpdate.class

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

out/production/infinitymonkeys/remote/IDrawingUpdate.class

out/production/infinitymonkeys/server/ChatController.class

...roduction/infinitymonkeys/server/ClientController$1.class

out/production/infinitymonkeys/server/ClientController.class

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

out/production/infinitymonkeys/server/Server.class

out/production/infinitymonkeys/server/User.class

src.zip

src/GUI/ApplicationMain.java

src/server/DrawingController.java