new file:   Qillqana-client-swing/conf/configuration.properties
	new file:   Qillqana-client-swing/images/_16_add.png
	new file:   Qillqana-client-swing/images/_16_arrow.png
	new file:   Qillqana-client-swing/images/_16_curve.png
	new file:   Qillqana-client-swing/images/_16_delete.png
	new file:   Qillqana-client-swing/images/_16_edit.png
	new file:   Qillqana-client-swing/images/_16_open.png
	new file:   Qillqana-client-swing/images/_16_preferences.png
	new file:   Qillqana-client-swing/images/_16_smooth_bush.png
	new file:   Qillqana-client-swing/images/_16_solid_brush.png
	new file:   Qillqana-client-swing/images/_22_back.png
	new file:   Qillqana-client-swing/images/_22_color.png
	new file:   Qillqana-client-swing/images/_22_draw.png
	new file:   Qillqana-client-swing/images/_22_eraser.png
	new file:   Qillqana-client-swing/images/_22_line.png
	new file:   Qillqana-client-swing/images/_22_lock.png
	new file:   Qillqana-client-swing/images/_22_microphone.png
	new file:   Qillqana-client-swing/images/_22_new.png
	new file:   Qillqana-client-swing/images/_22_next.png
	new file:   Qillqana-client-swing/images/_22_open.png
	new file:   Qillqana-client-swing/images/_22_polygon.png
	new file:   Qillqana-client-swing/images/_22_rectangle.png
	new file:   Qillqana-client-swing/images/_22_save.png
	new file:   Qillqana-client-swing/images/_22_sound.png
	new file:   Qillqana-client-swing/images/_22_upload.png
	new file:   Qillqana-client-swing/images/icon.png
	new file:   Qillqana-client-swing/images/whiteboard.png
	new file:   Qillqana-client-swing/locale/messages_en_US.properties
	new file:   Qillqana-client-swing/locale/messages_es_PE.properties
	new file:   Qillqana-client-swing/log4j.properties
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ClientApp.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/configurator/ConfSingleton.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/groovy/Main.groovy
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/locale/Messages.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/ConsoleSuscriptor.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/MessageMediador.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/SocketSuscriptor.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/UIChatSuscriptor.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlChat.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlate.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlides.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlStudenList.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/BrushSelectWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/ConfigWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/DlgBase.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/LoginWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/MainFrm.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/PreferenceWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StrokeStyleWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StudentLessonWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TeacherLessonsWindow.java
	new file:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TopicWindow.java
	new file:   Qillqana-client-swing/src/test/java/pe/edu/unsaac/in/qillqana/client/swing/ClientAppTest.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/Command.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/Constants.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/MessageCommand.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/QueryCommand.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/gson/GsonUtils.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/mediator/Mediator.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/mediator/Session.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Lesson.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/LessonFile.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Student.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Teacher.java
	new file:   Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/User.java
	new file:   Qillqana-common/src/test/java/pe/edu/unsaac/edu/in/qillqana/common/AppTest.java
	new file:   Qillqana-server/.gradle/1.10/taskArtifacts/cache.properties
	new file:   Qillqana-server/.gradle/1.10/taskArtifacts/cache.properties.lock
	new file:   Qillqana-server/.gradle/1.10/taskArtifacts/fileHashes.bin
	new file:   Qillqana-server/.gradle/1.10/taskArtifacts/outputFileStates.bin
	new file:   Qillqana-server/.gradle/1.10/taskArtifacts/taskArtifacts.bin
	new file:   Qillqana-server/build.gradle
	new file:   Qillqana-server/conf/configuration.properties
	new file:   Qillqana-server/log4j.properties
	new file:   Qillqana-server/qillqana.sql
	new file:   Qillqana-server/settings.gradle
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/ServerApp.java
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/Server.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/ServerThread.groovy
	new file:   build.gradle
	new file:   settings.gradle
	modified:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/ConsoleSuscriptor.java
	modified:   Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/MessageMediador.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/Command.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Command.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/Constants.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Constants.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/MessageCommand.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/MessageCommand.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/command/QueryCommand.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/QueryCommand.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/gson/GsonUtils.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/gson/GsonUtils.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/mediator/Mediator.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/mediator/Mediator.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/mediator/Session.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/mediator/Session.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/message/LoginMessage.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/message/Message.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/message/TextMessage.groovy
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Lesson.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Lesson.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/LessonFile.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/LessonFile.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Student.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Student.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/Teacher.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Teacher.java
	renamed:    Qillqana-common/src/main/java/pe/edu/unsaac/in/qillqana/common/model/User.java -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/User.java
	modified:   Qillqana-server/.gradle/1.10/taskArtifacts/cache.properties.lock
	modified:   Qillqana-server/.gradle/1.10/taskArtifacts/fileHashes.bin
	modified:   Qillqana-server/.gradle/1.10/taskArtifacts/outputFileStates.bin
	deleted:    Qillqana-server/build.gradle
	deleted:    Qillqana-server/settings.gradle
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/ServerApp.java
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/ChannelCommand.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/Command.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/Executor.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/ExecutorImpl.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/KickCommand.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/LoginCommand.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/NickCommand.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/Channel.groovy
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/Server.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/ServerThread.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/SocketSession.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/mediator/Mediator.java
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/mediator/Session.java
	modified:   build.gradle
	modified:   Qillqana-client-swing/conf/configuration.properties
	modified:   Qillqana-client-swing/locale/messages_en_US.properties
	modified:   Qillqana-client-swing/locale/messages_es_PE.properties
	modified:   Qillqana-client-swing/log4j.properties
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/StartApp.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/converters/BaseConverter.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/converters/OdpConverter.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/converters/PptConverter.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/converters/PptxConverter.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/mediador/ClientMediator.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/mediador/ConsoleSession.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/mediador/SocketSession.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/transfer/FtpTransfer.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/transfer/Transfer.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/PnlChat.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/PnlUserList.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/UserListModel.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/UserTableModel.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/window/ChatWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/window/DlgNickChannel.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ClientApp.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/configurator/ConfSingleton.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/groovy/Main.groovy
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/locale/Messages.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/ConsoleSuscriptor.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/MessageMediador.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/SocketSuscriptor.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/UIChatSuscriptor.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlChat.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlate.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlides.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlStudenList.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/BrushSelectWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/ConfigWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/DlgBase.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/LoginWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/MainFrm.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/PreferenceWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StrokeStyleWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StudentLessonWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TeacherLessonsWindow.java
	deleted:    Qillqana-client-swing/src/main/java/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TopicWindow.java
	modified:   Qillqana-client-swing/src/test/java/pe/edu/unsaac/in/qillqana/client/swing/ClientAppTest.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/ChannelCommand.groovy
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Command.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Constants.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/MessageCommand.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/MessageCommand.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/NickCommand.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/QueryCommand.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/QueryCommand.java
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Response/QueryResponse.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/StatusMessage.groovy
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/gson/GsonUtils.java
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/mediator/Mediator.java
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/mediator/Session.java
	modified:   Qillqana-server/log4j.properties
	deleted:    Qillqana-server/qillqana.sql
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/ServerApp.java
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/ChannelCommand.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/Command.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/Executor.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/ExecutorImpl.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/KickCommand.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/LoginCommand.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/command/NickCommand.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/ChannelExec.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/Exec.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/ExecBuilder.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/LoginExec.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/MessageExec.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/NickExec.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/QueryExec.groovy
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/Channel.groovy
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/Server.groovy
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/implementation/SocketSession.groovy
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/info/ChannelInfo.java
	new file:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/info/UserInfo.groovy
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/mediator/Mediator.java
	deleted:    Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/mediator/Session.java
	new file:   Qillqana-server/src/test/groovy/pe/edu/unsaac/in/qillqana/server/ServerAppTest.groovy
	new file:   Qillqana-server/src/test/groovy/pe/edu/unsaac/in/qillqana/server/implementation/SocketSessionTest.groovy
	modified:   build.gradle
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/StartApp.groovy
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/mediador/ClientMediator.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/ConsoleSuscriptor.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/MessageMediador.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/SocketSuscriptor.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/mediator/UIChatSuscriptor.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlChat.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlate.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlSlides.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/panels/PnlStudenList.java
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/PnlChat.java
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/PnlUserList.java
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/UserListModel.java
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/pnls/UserTableModel.groovy
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/window/ChatWindow.java
	deleted:    Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/window/DlgNickChannel.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/BrushSelectWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/ConfigWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/DlgBase.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/LoginWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/MainFrm.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/PreferenceWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StrokeStyleWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/StudentLessonWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TeacherLessonsWindow.java
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TopicWindow.java
	modified:   build.gradle
	modified:   Qillqana-client-swing/conf/configuration.properties
	modified:   Qillqana-client-swing/locale/messages_es_PE.properties
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/StartApp.groovy
	new file:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/facades/UserFacade.groovy
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/DlgBase.java
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/LoginWindow.java
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/MainFrm.java
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/ui/windows/TeacherLessonsWindow.java
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/LoginCommand.groovy
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/command/Response/QueryResponse.groovy
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/User.java
	modified:   Qillqana-server/src/main/groovy/pe/edu/unsaac/in/qillqana/server/executor/LoginExec.groovy
Review
Review
	renamed:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/File.groovy -> Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Item.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Item.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Lesson.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/LessonFile.groovy
	modified:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Period.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Student.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Teacher.groovy
	new file:   Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/User.groovy
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/StartApp.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Lesson.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/LessonFile.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Student.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Teacher.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/User.java
	modified:   Qillqana-client-swing/src/main/groovy/pe/edu/unsaac/in/qillqana/client/swing/StartApp.groovy
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Lesson.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/LessonFile.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Student.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/Teacher.java
	deleted:    Qillqana-common/src/main/groovy/pe/edu/unsaac/in/qillqana/common/model/User.java
	modified:   Qillqana-client-swing/conf/configuration.properties
	new file:   README.md
	modified:   README.md
Initial web commit
	modified:   index.html
Merge branch 'gh-pages' of https://github.com/alexove/qillqana into gh-pages

Conflicts:
	index.html

	modified:   index.html