neue GUI Versionen

90 files changed, 2945 insertions, 993 deletions

diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
new file mode 100644
index 00000000..5a172814
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
new file mode 100644
index 00000000..fcbdc9e8
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
new file mode 100644
index 00000000..cb5e122c
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
new file mode 100644
index 00000000..b20cf2f8
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
new file mode 100644
index 00000000..f7b36c07
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class
new file mode 100644
index 00000000..62cc076d
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
new file mode 100644
index 00000000..258ffb22
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
new file mode 100644
index 00000000..caadfbe2
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
new file mode 100644
index 00000000..7ad8ecb2
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
new file mode 100644
index 00000000..a758a551
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EditImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class
deleted file mode 100644
index e89f833c..00000000
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class
deleted file mode 100644
index 636b9697..00000000
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class
deleted file mode 100644
index f7568353..00000000
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
deleted file mode 100644
index b64ceca1..00000000
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein.class b/Dozentenmodul/bin/GUI/EingabeAllgemein.class
deleted file mode 100644
index ad90ee37..00000000
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class
new file mode 100644
index 00000000..2acc5103
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class
new file mode 100644
index 00000000..438107e9
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class
new file mode 100644
index 00000000..7ac1fb57
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class
new file mode 100644
index 00000000..d3cc7b54
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class
new file mode 100644
index 00000000..8cf087fe
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class
new file mode 100644
index 00000000..83868e37
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class
new file mode 100644
index 00000000..256550dd
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
new file mode 100644
index 00000000..768b1609
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
new file mode 100644
index 00000000..903774cd
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
new file mode 100644
index 00000000..37e3742e
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class
index 7d81e47a..67f969dd 100644
--- a/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class
+++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class
diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$1.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$1.class
new file mode 100644
index 00000000..3a488d1f
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$2.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$2.class
new file mode 100644
index 00000000..9ab60749
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$3.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$3.class
new file mode 100644
index 00000000..9ef7db7c
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class
new file mode 100644
index 00000000..b6068b0d
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/ExtendedSearch_GUI.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$1.class b/Dozentenmodul/bin/GUI/FTPDownloader$1.class
deleted file mode 100644
index b97f479a..00000000
--- a/Dozentenmodul/bin/GUI/FTPDownloader$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$2.class b/Dozentenmodul/bin/GUI/FTPDownloader$2.class
deleted file mode 100644
index 3114758a..00000000
--- a/Dozentenmodul/bin/GUI/FTPDownloader$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$3.class b/Dozentenmodul/bin/GUI/FTPDownloader$3.class
deleted file mode 100644
index 1804e5a1..00000000
--- a/Dozentenmodul/bin/GUI/FTPDownloader$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$4.class b/Dozentenmodul/bin/GUI/FTPDownloader$4.class
deleted file mode 100644
index 95a47553..00000000
--- a/Dozentenmodul/bin/GUI/FTPDownloader$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader.class b/Dozentenmodul/bin/GUI/FTPDownloader.class
deleted file mode 100644
index 5e40b98e..00000000
--- a/Dozentenmodul/bin/GUI/FTPDownloader.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
new file mode 100644
index 00000000..87c4357f
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
new file mode 100644
index 00000000..1a785eec
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
new file mode 100644
index 00000000..0e294890
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
new file mode 100644
index 00000000..240d4147
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
new file mode 100644
index 00000000..beba4335
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$1.class b/Dozentenmodul/bin/GUI/FTPUploader$1.class
deleted file mode 100644
index eb35f67d..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$2.class b/Dozentenmodul/bin/GUI/FTPUploader$2.class
deleted file mode 100644
index 947c4bfc..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$3.class b/Dozentenmodul/bin/GUI/FTPUploader$3.class
deleted file mode 100644
index a2c03bb7..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$4.class b/Dozentenmodul/bin/GUI/FTPUploader$4.class
deleted file mode 100644
index e4bc53ff..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader$5.class b/Dozentenmodul/bin/GUI/FTPUploader$5.class
deleted file mode 100644
index 10020730..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader$5.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader.class b/Dozentenmodul/bin/GUI/FTPUploader.class
deleted file mode 100644
index 1a25bc45..00000000
--- a/Dozentenmodul/bin/GUI/FTPUploader.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
new file mode 100644
index 00000000..7dbb07e9
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
new file mode 100644
index 00000000..2dab621c
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
new file mode 100644
index 00000000..a884e957
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
new file mode 100644
index 00000000..cfba984b
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
new file mode 100644
index 00000000..17930b2e
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
new file mode 100644
index 00000000..4b923961
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
index e99580f8..34f8cea1 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
index 82e0afb8..5f7269ee 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
index 1a2d8dfa..0600f21f 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
index 1f3beb48..e3fb3da8 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index 1ba7aa83..eba29a4e 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
new file mode 100644
index 00000000..f2284e95
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class
new file mode 100644
index 00000000..062fb71e
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class
new file mode 100644
index 00000000..0d76418d
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class
new file mode 100644
index 00000000..2ce28f3c
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class
new file mode 100644
index 00000000..64ebbfbe
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class
new file mode 100644
index 00000000..4b7251fa
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
new file mode 100644
index 00000000..5ae317e0
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class
new file mode 100644
index 00000000..ec42bcc5
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchMethod_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class
new file mode 100644
index 00000000..489e5cbc
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchMethod_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class
new file mode 100644
index 00000000..e8e4be15
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchMethod_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class
new file mode 100644
index 00000000..c42fde89
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchMethod_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/SearchMethod_GUI.class b/Dozentenmodul/bin/GUI/SearchMethod_GUI.class
new file mode 100644
index 00000000..548e1645
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchMethod_GUI.class
diff --git a/Dozentenmodul/bin/GUI/Summary$4.class b/Dozentenmodul/bin/GUI/Summary$4.class
index 6089b4ee..1e19639a 100644
--- a/Dozentenmodul/bin/GUI/Summary$4.class
+++ b/Dozentenmodul/bin/GUI/Summary$4.class
diff --git a/Dozentenmodul/bin/GUI/Summary$7.class b/Dozentenmodul/bin/GUI/Summary$7.class
index 6ead73e4..7460909c 100644
--- a/Dozentenmodul/bin/GUI/Summary$7.class
+++ b/Dozentenmodul/bin/GUI/Summary$7.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling$4.class b/Dozentenmodul/bin/GUI/searchRohling$4.class
index cebd554f..6ea2c49f 100644
--- a/Dozentenmodul/bin/GUI/searchRohling$4.class
+++ b/Dozentenmodul/bin/GUI/searchRohling$4.class
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class
new file mode 100644
index 00000000..12094191
--- /dev/null
+++ b/Dozentenmodul/bin/Models/Image.class
diff --git a/Dozentenmodul/bin/downloader/DownloadTask.class b/Dozentenmodul/bin/downloader/DownloadTask.class
index af78e45a..210944c5 100644
--- a/Dozentenmodul/bin/downloader/DownloadTask.class
+++ b/Dozentenmodul/bin/downloader/DownloadTask.class
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
new file mode 100644
index 00000000..6926bc90
--- /dev/null
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -0,0 +1,335 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import javax.swing.JTextField;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import Models.Image;
+import Models.person;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+@SuppressWarnings("serial")
+public class EditImageAllgemein_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField Vorname;
+	private JTextField Nachname;
+	private JTextField Hochschule;
+	private JTextField EMail;
+	private JTextField Tel;
+	private JTextField Fak;
+	private JTextField imagename;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EditImageAllgemein_GUI dialog = new EditImageAllgemein_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditImageAllgemein_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Bearbeiten Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 66, 557, 369);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel label = new JLabel("Vorname: *");
+		label.setBackground(SystemColor.menu);
+		label.setBounds(10, 183, 125, 20);
+		panel_1.add(label);
+		
+		Vorname = new JTextField();
+		Vorname.setBackground(Color.WHITE);
+		Vorname.setText((String) null);
+		Vorname.setColumns(10);
+		Vorname.setBounds(145, 183, 350, 20);
+		panel_1.add(Vorname);
+		
+		JLabel label_7 = new JLabel("Nachname: *");
+		label_7.setBackground(SystemColor.menu);
+		label_7.setBounds(10, 214, 125, 20);
+		panel_1.add(label_7);
+		
+		Nachname = new JTextField();
+		Nachname.setBackground(Color.WHITE);
+		Nachname.setText((String) null);
+		Nachname.setColumns(10);
+		Nachname.setBounds(145, 214, 350, 20);
+		panel_1.add(Nachname);
+		
+		JLabel label_8 = new JLabel("Hochschule: *");
+		label_8.setBackground(SystemColor.menu);
+		label_8.setBounds(10, 245, 125, 20);
+		panel_1.add(label_8);
+		
+		Hochschule = new JTextField();
+		Hochschule.setBackground(Color.WHITE);
+		Hochschule.setText((String) null);
+		Hochschule.setColumns(10);
+		Hochschule.setBounds(145, 245, 350, 20);
+		panel_1.add(Hochschule);
+		
+		JLabel label_9 = new JLabel("E-Mail: *");
+		label_9.setBackground(SystemColor.menu);
+		label_9.setBounds(10, 276, 125, 20);
+		panel_1.add(label_9);
+		
+		EMail = new JTextField();
+		EMail.setBackground(Color.WHITE);
+		EMail.setText((String) null);
+		EMail.setColumns(10);
+		EMail.setBounds(145, 276, 350, 20);
+		panel_1.add(EMail);
+		
+		JLabel label_10 = new JLabel("Tel.-Nummer:");
+		label_10.setBackground(SystemColor.menu);
+		label_10.setBounds(10, 307, 125, 20);
+		panel_1.add(label_10);
+		
+		Tel = new JTextField();
+		Tel.setBackground(Color.WHITE);
+		Tel.setText((String) null);
+		Tel.setColumns(10);
+		Tel.setBounds(145, 307, 350, 20);
+		panel_1.add(Tel);
+		
+		JLabel lblFakulttinstitution = new JLabel("Fakult\u00E4t/Institution:");
+		lblFakulttinstitution.setBackground(SystemColor.menu);
+		lblFakulttinstitution.setBounds(10, 338, 125, 20);
+		panel_1.add(lblFakulttinstitution);
+		
+		Fak = new JTextField();
+		Fak.setBackground(Color.WHITE);
+		Fak.setText((String) null);
+		Fak.setColumns(10);
+		Fak.setBounds(145, 338, 350, 20);
+		panel_1.add(Fak);
+		
+		JLabel lblImagename = new JLabel("Imagename: *");
+		lblImagename.setBackground(SystemColor.menu);
+		lblImagename.setBounds(10, 31, 125, 20);
+		panel_1.add(lblImagename);
+		
+		imagename = new JTextField();
+		imagename.setBackground(Color.WHITE);
+		imagename.setText((String) null);
+		imagename.setColumns(10);
+		imagename.setBounds(145, 31, 350, 20);
+		panel_1.add(imagename);
+		
+		JTextArea txtrGebenSieBitte = new JTextArea();
+		txtrGebenSieBitte.setBackground(SystemColor.menu);
+		txtrGebenSieBitte.setLineWrap(true);
+		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
+		txtrGebenSieBitte.setBounds(145, 62, 350, 110);
+		panel_1.add(txtrGebenSieBitte);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
+		lblPflichtfelder.setBounds(10, 442, 136, 14);
+		contentPanel.add(lblPflichtfelder);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditImageAllgemein_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
+		lblNewLabel_1.setBounds(146, 11, 71, 14);
+		contentPanel.add(lblNewLabel_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						person.verantowrtlicher.setVorname(Vorname.getText());
+						person.verantowrtlicher.setName(Nachname.getText());
+						person.verantowrtlicher.setEMail(EMail.getText());
+						person.verantowrtlicher.setFakultät(Fak.getText());
+						person.verantowrtlicher.setHochschule(Hochschule.getText());
+						person.verantowrtlicher.setTel(Tel.getText());
+						Image.image.setImagename(imagename.getText());
+						MainMenue_GUI sr=new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
+						{
+						person.verantowrtlicher.setVorname(Vorname.getText());
+						person.verantowrtlicher.setName(Nachname.getText());
+						person.verantowrtlicher.setEMail(EMail.getText());
+						person.verantowrtlicher.setFakultät(Fak.getText());
+						person.verantowrtlicher.setHochschule(Hochschule.getText());
+						person.verantowrtlicher.setTel(Tel.getText());
+						Image.image.setImagename(imagename.getText());
+						EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI();
+						ea.setVisible(true);
+						dispose();
+						}
+						else{
+							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
+									"Error", JOptionPane.ERROR_MESSAGE);	
+						}
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
new file mode 100644
index 00000000..d58c3eeb
--- /dev/null
+++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
@@ -0,0 +1,310 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import Models.Image;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+
+@SuppressWarnings("serial")
+public class EditImageTechnisch_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JSpinner spinnerCPU;
+	JSpinner spinnerRam;
+	JRadioButton rdbtnlicenseJa;
+	JRadioButton rdbtnlicenseNein;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EditImageTechnisch_GUI dialog = new EditImageTechnisch_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditImageTechnisch_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 66, 557, 95);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		rdbtnlicenseJa = new JRadioButton("Ja");
+		rdbtnlicenseJa.setSelected(true);
+		buttonGrouplicense.add(rdbtnlicenseJa);
+		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
+		panel_1.add(rdbtnlicenseJa);
+		
+		rdbtnlicenseNein = new JRadioButton("Nein");
+		buttonGrouplicense.add(rdbtnlicenseNein);
+		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+		panel_1.add(rdbtnlicenseNein);
+		
+		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		panel_1.add(lblInternetIstInnerhalb);
+		
+		JRadioButton rdbtnInternetJa = new JRadioButton("Ja");
+		buttonGroupInternet.add(rdbtnInternetJa);
+		rdbtnInternetJa.setBounds(266, 57, 109, 23);
+		panel_1.add(rdbtnInternetJa);
+		
+		JRadioButton rdbtnInternetNein = new JRadioButton("Nein");
+		rdbtnInternetNein.setSelected(true);
+		buttonGroupInternet.add(rdbtnInternetNein);
+		rdbtnInternetNein.setBounds(377, 57, 109, 23);
+		panel_1.add(rdbtnInternetNein);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditImageTechnisch_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 172, 557, 338);
+		contentPanel.add(panel_2);
+		
+		JTextArea txtrHinweisSolltenSie = new JTextArea();
+		txtrHinweisSolltenSie.setBackground(SystemColor.menu);
+		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
+		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
+		panel_2.add(txtrHinweisSolltenSie);
+		
+		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+		lblNewLabel_3.setBounds(10, 91, 280, 20);
+		panel_2.add(lblNewLabel_3);
+		
+		JLabel lblMindestens = new JLabel("mindestens");
+		lblMindestens.setBounds(315, 91, 60, 20);
+		panel_2.add(lblMindestens);
+		
+		spinnerRam = new JSpinner();
+		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
+		spinnerRam.setBounds(385, 88, 29, 20);
+		panel_2.add(spinnerRam);
+		
+		JLabel lblGbyte = new JLabel("GByte");
+		lblGbyte.setBounds(424, 91, 46, 20);
+		panel_2.add(lblGbyte);
+		
+		JTextArea txtrBeispielWindows = new JTextArea();
+		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
+		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrBeispielWindows.setBackground(SystemColor.menu);
+		txtrBeispielWindows.setBounds(10, 122, 280, 55);
+		panel_2.add(txtrBeispielWindows);
+		
+		JTextArea txtrBeispielWindows_1 = new JTextArea();
+		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
+		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrBeispielWindows_1.setBackground(SystemColor.menu);
+		txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
+		panel_2.add(txtrBeispielWindows_1);
+		
+		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
+		lblWieVieleCpus.setBounds(10, 191, 280, 20);
+		panel_2.add(lblWieVieleCpus);
+		
+		JLabel label_3 = new JLabel("mindestens");
+		label_3.setBounds(315, 191, 60, 20);
+		panel_2.add(label_3);
+		
+		spinnerCPU = new JSpinner();
+		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
+		spinnerCPU.setBounds(385, 188, 29, 20);
+		panel_2.add(spinnerCPU);
+		
+		JLabel lblKerne = new JLabel("Kerne");
+		lblKerne.setBounds(424, 191, 46, 20);
+		panel_2.add(lblKerne);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						
+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+
+						FTPUploader_GUI ea=new FTPUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java
deleted file mode 100644
index c04a01b5..00000000
--- a/Dozentenmodul/src/GUI/EingabeAllgemein.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package GUI;

-

-

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JOptionPane;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import javax.swing.JTextField;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JCheckBox;

-import javax.swing.JSeparator;

-import javax.swing.event.ChangeListener;

-import javax.swing.event.ChangeEvent;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import Models.person;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.border.TitledBorder;

-

-@SuppressWarnings("serial")

-public class EingabeAllgemein extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	JCheckBox chckbxDerVerantwortlicheEntspricht;

-	private JTextField Vorname_V;

-	private JTextField Nachname_V;

-	private JTextField Hochschule_V;

-	private JTextField EMail_V;

-	private JTextField Tel_V;

-	private JTextField Fak_V;

-	private JTextField Vorname_E;

-	private JTextField Nachname_E;

-	private JTextField Hochschule_E;

-	private JTextField EMail_E;

-	private JTextField Tel_E;

-	private JTextField Fak_E;

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			EingabeAllgemein dialog = new EingabeAllgemein();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public EingabeAllgemein() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				System.exit(0);

-			}

-		});

-		setResizable(false);

-		

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("bwLehrpool Suite *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 603) / 2;

-		int left=(screenSize.width - 722) / 2;

-		setBounds(left, top, 603, 722);

-		//setBounds(100, 100, 603, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBackground(Color.WHITE);

-			panel.setBounds(10, 11, 577, 57);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Eingabe der allgemeinen Daten (Schritt 3 von 7)");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(Color.WHITE);

-			txtpnBitteWhlenSie.setText("Geben Sie hier bitte die Kontaktdaten des Vernatwortlichen und des Erstellers der VMDK ein");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 85, 577, 493);

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		chckbxDerVerantwortlicheEntspricht = new JCheckBox("Der Verantwortliche entspricht dem Ersteller");

-		chckbxDerVerantwortlicheEntspricht.setSelected(person.verantowrtlicher.isIschecked());

-		chckbxDerVerantwortlicheEntspricht.addChangeListener(new ChangeListener() {

-			public void stateChanged(ChangeEvent arg0) {

-				if(chckbxDerVerantwortlicheEntspricht.isSelected()==true){

-				Nachname_E.setText(Nachname_V.getText());

-				Vorname_E.setText(Vorname_V.getText());

-				Hochschule_E.setText(Hochschule_V.getText());

-				EMail_E.setText(EMail_V.getText());

-				Tel_E.setText(Tel_V.getText());

-				Fak_E.setText(Fak_V.getText());

-				}else{

-					Nachname_E.setText("");

-					Vorname_E.setText("");

-					Hochschule_E.setText("");

-					EMail_E.setText("");

-					Tel_E.setText("");

-					Fak_E.setText("");

-				}

-			}

-		});

-		chckbxDerVerantwortlicheEntspricht.setBackground(Color.WHITE);

-		chckbxDerVerantwortlicheEntspricht.setBounds(10, 239, 264, 23);

-		contentPanel.add(chckbxDerVerantwortlicheEntspricht);

-		

-		JPanel panel_1 = new JPanel();

-		panel_1.setBackground(Color.WHITE);

-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Verantwortlichen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel_1.setBounds(10, 22, 557, 210);

-		contentPanel.add(panel_1);

-		panel_1.setLayout(null);

-		

-		JLabel label = new JLabel("Vorname: *");

-		label.setBounds(10, 24, 125, 20);

-		panel_1.add(label);

-		

-		Vorname_V = new JTextField();

-		Vorname_V.setText((String) null);

-		Vorname_V.setColumns(10);

-		Vorname_V.setBounds(145, 24, 350, 20);

-		panel_1.add(Vorname_V);

-		

-		JLabel label_7 = new JLabel("Nachname: *");

-		label_7.setBounds(10, 55, 125, 20);

-		panel_1.add(label_7);

-		

-		Nachname_V = new JTextField();

-		Nachname_V.setText((String) null);

-		Nachname_V.setColumns(10);

-		Nachname_V.setBounds(145, 55, 350, 20);

-		panel_1.add(Nachname_V);

-		

-		JLabel label_8 = new JLabel("Hochschule: *");

-		label_8.setBounds(10, 86, 125, 20);

-		panel_1.add(label_8);

-		

-		Hochschule_V = new JTextField();

-		Hochschule_V.setText((String) null);

-		Hochschule_V.setColumns(10);

-		Hochschule_V.setBounds(145, 86, 350, 20);

-		panel_1.add(Hochschule_V);

-		

-		JLabel label_9 = new JLabel("E-Mail: *");

-		label_9.setBounds(10, 117, 125, 20);

-		panel_1.add(label_9);

-		

-		EMail_V = new JTextField();

-		EMail_V.setText((String) null);

-		EMail_V.setColumns(10);

-		EMail_V.setBounds(145, 117, 350, 20);

-		panel_1.add(EMail_V);

-		

-		JLabel label_10 = new JLabel("Tel.-Nummer:");

-		label_10.setBounds(10, 148, 125, 20);

-		panel_1.add(label_10);

-		

-		Tel_V = new JTextField();

-		Tel_V.setText((String) null);

-		Tel_V.setColumns(10);

-		Tel_V.setBounds(145, 148, 350, 20);

-		panel_1.add(Tel_V);

-		

-		JLabel label_11 = new JLabel("Fakult\u00E4t:");

-		label_11.setBounds(10, 179, 125, 20);

-		panel_1.add(label_11);

-		

-		Fak_V = new JTextField();

-		Fak_V.setText((String) null);

-		Fak_V.setColumns(10);

-		Fak_V.setBounds(145, 179, 350, 20);

-		panel_1.add(Fak_V);

-		

-		JPanel panel_2 = new JPanel();

-		panel_2.setBackground(Color.WHITE);

-		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel_2.setBounds(6, 269, 561, 218);

-		contentPanel.add(panel_2);

-		panel_2.setLayout(null);

-		

-		JLabel label_1 = new JLabel("Vorname: *");

-		label_1.setBounds(10, 21, 125, 20);

-		panel_2.add(label_1);

-		

-		Vorname_E = new JTextField();

-		Vorname_E.setText((String) null);

-		Vorname_E.setColumns(10);

-		Vorname_E.setBounds(145, 21, 350, 20);

-		panel_2.add(Vorname_E);

-		

-		JLabel label_2 = new JLabel("Nachname: *");

-		label_2.setBounds(10, 52, 125, 20);

-		panel_2.add(label_2);

-		

-		Nachname_E = new JTextField();

-		Nachname_E.setText((String) null);

-		Nachname_E.setColumns(10);

-		Nachname_E.setBounds(145, 52, 350, 20);

-		panel_2.add(Nachname_E);

-		

-		Hochschule_E = new JTextField();

-		Hochschule_E.setText((String) null);

-		Hochschule_E.setColumns(10);

-		Hochschule_E.setBounds(145, 83, 350, 20);

-		panel_2.add(Hochschule_E);

-		

-		JLabel label_3 = new JLabel("Hochschule: *");

-		label_3.setBounds(10, 83, 125, 20);

-		panel_2.add(label_3);

-		

-		JLabel label_4 = new JLabel("E-Mail: *");

-		label_4.setBounds(10, 114, 125, 20);

-		panel_2.add(label_4);

-		

-		EMail_E = new JTextField();

-		EMail_E.setText((String) null);

-		EMail_E.setColumns(10);

-		EMail_E.setBounds(145, 114, 350, 20);

-		panel_2.add(EMail_E);

-		

-		Tel_E = new JTextField();

-		Tel_E.setText((String) null);

-		Tel_E.setColumns(10);

-		Tel_E.setBounds(145, 145, 350, 20);

-		panel_2.add(Tel_E);

-		

-		JLabel label_5 = new JLabel("Tel.-Nummer:");

-		label_5.setBounds(10, 145, 125, 20);

-		panel_2.add(label_5);

-		

-		JLabel label_6 = new JLabel("Fakult\u00E4t:");

-		label_6.setBounds(10, 176, 125, 20);

-		panel_2.add(label_6);

-		

-		Fak_E = new JTextField();

-		Fak_E.setText((String) null);

-		Fak_E.setColumns(10);

-		Fak_E.setBounds(145, 176, 350, 20);

-		panel_2.add(Fak_E);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 640, 597, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton okButton = new JButton("Zur\u00FCck");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						person.verantowrtlicher.setVorname(Vorname_V.getText());

-						person.verantowrtlicher.setName(Nachname_V.getText());

-						person.verantowrtlicher.setEMail(EMail_V.getText());

-						person.verantowrtlicher.setFakultät(Fak_V.getText());

-						person.verantowrtlicher.setHochschule(Hochschule_V.getText());

-						person.verantowrtlicher.setTel(Tel_V.getText());

-						person.verantowrtlicher.setIschecked(chckbxDerVerantwortlicheEntspricht.isSelected());

-						person.ersteller.setEMail(EMail_E.getText());

-						person.ersteller.setFakultät(Fak_E.getText());

-						person.ersteller.setHochschule(Hochschule_E.getText());

-						person.ersteller.setName(Nachname_E.getText());

-						person.ersteller.setVorname(Vorname_V.getText());

-						person.ersteller.setTel(Tel_E.getText());

-						VmWareLink_GUI sr=new VmWareLink_GUI();

-						sr.setVisible(true);

-						dispose();

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

-				JButton cancelButton = new JButton("Weiter");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(Vorname_V.getText().isEmpty()==false && Nachname_V.getText().isEmpty()==false && Hochschule_V.getText().isEmpty()==false&&EMail_V.getText().isEmpty()==false&&Vorname_E.getText().isEmpty()==false && Nachname_E.getText().isEmpty()==false && Hochschule_E.getText().isEmpty()==false&&EMail_E.getText().isEmpty()==false)

-						{

-						person.verantowrtlicher.setVorname(Vorname_V.getText());

-						person.verantowrtlicher.setName(Nachname_V.getText());

-						person.verantowrtlicher.setEMail(EMail_V.getText());

-						person.verantowrtlicher.setFakultät(Fak_V.getText());

-						person.verantowrtlicher.setHochschule(Hochschule_V.getText());

-						person.verantowrtlicher.setTel(Tel_V.getText());

-						person.verantowrtlicher.setIschecked(chckbxDerVerantwortlicheEntspricht.isSelected());

-						person.ersteller.setEMail(EMail_E.getText());

-						person.ersteller.setFakultät(Fak_E.getText());

-						person.ersteller.setHochschule(Hochschule_E.getText());

-						person.ersteller.setName(Nachname_E.getText());

-						person.ersteller.setVorname(Vorname_E.getText());

-						person.ersteller.setTel(Tel_E.getText());

-						EingabeSystemDaten ea=new EingabeSystemDaten();

-						ea.setVisible(true);

-						dispose();

-						}

-						else{

-							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",

-									"Error", JOptionPane.ERROR_MESSAGE);	

-						}

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 78, 597, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 627, 597, 2);

-		getContentPane().add(separator_1);

-		

-		JPanel panel = new JPanel();

-		panel.setLayout(null);

-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		panel.setBackground(Color.WHITE);

-		panel.setBounds(10, 583, 577, 33);

-		getContentPane().add(panel);

-		

-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");

-		lblPflichtfelder.setBounds(10, 11, 136, 14);

-		panel.add(lblPflichtfelder);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

-		JMenu mnNewMenu = new JMenu("Suchen");

-		menuBar.add(mnNewMenu);

-		

-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

-		mnNewMenu.add(mntmVlSuche);

-		

-		JMenu mnNewMenu_1 = new JMenu("Hilfe");

-		menuBar.add(mnNewMenu_1);

-		

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mnNewMenu_1.add(mntmFaq);

-		

-		JMenuItem mntmOtrs = new JMenuItem("OTRS");

-		mnNewMenu_1.add(mntmOtrs);

-		

-	}

-}

diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
new file mode 100644
index 00000000..7b09b6b8
--- /dev/null
+++ b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
@@ -0,0 +1,335 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import javax.swing.JTextField;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import Models.Image;
+import Models.person;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+@SuppressWarnings("serial")
+public class EingabeImageAllgemein_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField Vorname;
+	private JTextField Nachname;
+	private JTextField Hochschule;
+	private JTextField EMail;
+	private JTextField Tel;
+	private JTextField Fak;
+	private JTextField imagename;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EingabeImageAllgemein_GUI dialog = new EingabeImageAllgemein_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EingabeImageAllgemein_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 66, 557, 369);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel label = new JLabel("Vorname: *");
+		label.setBackground(SystemColor.menu);
+		label.setBounds(10, 183, 125, 20);
+		panel_1.add(label);
+		
+		Vorname = new JTextField();
+		Vorname.setBackground(Color.WHITE);
+		Vorname.setText((String) null);
+		Vorname.setColumns(10);
+		Vorname.setBounds(145, 183, 350, 20);
+		panel_1.add(Vorname);
+		
+		JLabel label_7 = new JLabel("Nachname: *");
+		label_7.setBackground(SystemColor.menu);
+		label_7.setBounds(10, 214, 125, 20);
+		panel_1.add(label_7);
+		
+		Nachname = new JTextField();
+		Nachname.setBackground(Color.WHITE);
+		Nachname.setText((String) null);
+		Nachname.setColumns(10);
+		Nachname.setBounds(145, 214, 350, 20);
+		panel_1.add(Nachname);
+		
+		JLabel label_8 = new JLabel("Hochschule: *");
+		label_8.setBackground(SystemColor.menu);
+		label_8.setBounds(10, 245, 125, 20);
+		panel_1.add(label_8);
+		
+		Hochschule = new JTextField();
+		Hochschule.setBackground(Color.WHITE);
+		Hochschule.setText((String) null);
+		Hochschule.setColumns(10);
+		Hochschule.setBounds(145, 245, 350, 20);
+		panel_1.add(Hochschule);
+		
+		JLabel label_9 = new JLabel("E-Mail: *");
+		label_9.setBackground(SystemColor.menu);
+		label_9.setBounds(10, 276, 125, 20);
+		panel_1.add(label_9);
+		
+		EMail = new JTextField();
+		EMail.setBackground(Color.WHITE);
+		EMail.setText((String) null);
+		EMail.setColumns(10);
+		EMail.setBounds(145, 276, 350, 20);
+		panel_1.add(EMail);
+		
+		JLabel label_10 = new JLabel("Tel.-Nummer:");
+		label_10.setBackground(SystemColor.menu);
+		label_10.setBounds(10, 307, 125, 20);
+		panel_1.add(label_10);
+		
+		Tel = new JTextField();
+		Tel.setBackground(Color.WHITE);
+		Tel.setText((String) null);
+		Tel.setColumns(10);
+		Tel.setBounds(145, 307, 350, 20);
+		panel_1.add(Tel);
+		
+		JLabel lblFakulttinstitution = new JLabel("Fakult\u00E4t/Institution:");
+		lblFakulttinstitution.setBackground(SystemColor.menu);
+		lblFakulttinstitution.setBounds(10, 338, 125, 20);
+		panel_1.add(lblFakulttinstitution);
+		
+		Fak = new JTextField();
+		Fak.setBackground(Color.WHITE);
+		Fak.setText((String) null);
+		Fak.setColumns(10);
+		Fak.setBounds(145, 338, 350, 20);
+		panel_1.add(Fak);
+		
+		JLabel lblImagename = new JLabel("Imagename: *");
+		lblImagename.setBackground(SystemColor.menu);
+		lblImagename.setBounds(10, 31, 125, 20);
+		panel_1.add(lblImagename);
+		
+		imagename = new JTextField();
+		imagename.setBackground(Color.WHITE);
+		imagename.setText((String) null);
+		imagename.setColumns(10);
+		imagename.setBounds(145, 31, 350, 20);
+		panel_1.add(imagename);
+		
+		JTextArea txtrGebenSieBitte = new JTextArea();
+		txtrGebenSieBitte.setBackground(SystemColor.menu);
+		txtrGebenSieBitte.setLineWrap(true);
+		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
+		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
+		txtrGebenSieBitte.setBounds(145, 62, 350, 110);
+		panel_1.add(txtrGebenSieBitte);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
+		lblPflichtfelder.setBounds(10, 442, 136, 14);
+		contentPanel.add(lblPflichtfelder);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EingabeImageAllgemein_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						person.verantowrtlicher.setVorname(Vorname.getText());
+						person.verantowrtlicher.setName(Nachname.getText());
+						person.verantowrtlicher.setEMail(EMail.getText());
+						person.verantowrtlicher.setFakultät(Fak.getText());
+						person.verantowrtlicher.setHochschule(Hochschule.getText());
+						person.verantowrtlicher.setTel(Tel.getText());
+						Image.image.setImagename(imagename.getText());
+						MainMenue_GUI sr=new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
+						{
+						person.verantowrtlicher.setVorname(Vorname.getText());
+						person.verantowrtlicher.setName(Nachname.getText());
+						person.verantowrtlicher.setEMail(EMail.getText());
+						person.verantowrtlicher.setFakultät(Fak.getText());
+						person.verantowrtlicher.setHochschule(Hochschule.getText());
+						person.verantowrtlicher.setTel(Tel.getText());
+						Image.image.setImagename(imagename.getText());
+						EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI();
+						ea.setVisible(true);
+						dispose();
+						}
+						else{
+							JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
+									"Error", JOptionPane.ERROR_MESSAGE);	
+						}
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
new file mode 100644
index 00000000..3f984461
--- /dev/null
+++ b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
@@ -0,0 +1,310 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import Models.Image;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+
+@SuppressWarnings("serial")
+public class EingabeImageTechnisch_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JSpinner spinnerCPU;
+	JSpinner spinnerRam;
+	JRadioButton rdbtnlicenseJa;
+	JRadioButton rdbtnlicenseNein;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EingabeImageTechnisch_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 66, 557, 95);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		rdbtnlicenseJa = new JRadioButton("Ja");
+		rdbtnlicenseJa.setSelected(true);
+		buttonGrouplicense.add(rdbtnlicenseJa);
+		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
+		panel_1.add(rdbtnlicenseJa);
+		
+		rdbtnlicenseNein = new JRadioButton("Nein");
+		buttonGrouplicense.add(rdbtnlicenseNein);
+		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+		panel_1.add(rdbtnlicenseNein);
+		
+		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		panel_1.add(lblInternetIstInnerhalb);
+		
+		JRadioButton rdbtnInternetJa = new JRadioButton("Ja");
+		buttonGroupInternet.add(rdbtnInternetJa);
+		rdbtnInternetJa.setBounds(266, 57, 109, 23);
+		panel_1.add(rdbtnInternetJa);
+		
+		JRadioButton rdbtnInternetNein = new JRadioButton("Nein");
+		rdbtnInternetNein.setSelected(true);
+		buttonGroupInternet.add(rdbtnInternetNein);
+		rdbtnInternetNein.setBounds(377, 57, 109, 23);
+		panel_1.add(rdbtnInternetNein);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EingabeImageTechnisch_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(146, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 172, 557, 338);
+		contentPanel.add(panel_2);
+		
+		JTextArea txtrHinweisSolltenSie = new JTextArea();
+		txtrHinweisSolltenSie.setBackground(SystemColor.menu);
+		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
+		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
+		panel_2.add(txtrHinweisSolltenSie);
+		
+		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+		lblNewLabel_3.setBounds(10, 91, 280, 20);
+		panel_2.add(lblNewLabel_3);
+		
+		JLabel lblMindestens = new JLabel("mindestens");
+		lblMindestens.setBounds(315, 91, 60, 20);
+		panel_2.add(lblMindestens);
+		
+		spinnerRam = new JSpinner();
+		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
+		spinnerRam.setBounds(385, 88, 29, 20);
+		panel_2.add(spinnerRam);
+		
+		JLabel lblGbyte = new JLabel("GByte");
+		lblGbyte.setBounds(424, 91, 46, 20);
+		panel_2.add(lblGbyte);
+		
+		JTextArea txtrBeispielWindows = new JTextArea();
+		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
+		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrBeispielWindows.setBackground(SystemColor.menu);
+		txtrBeispielWindows.setBounds(10, 122, 280, 55);
+		panel_2.add(txtrBeispielWindows);
+		
+		JTextArea txtrBeispielWindows_1 = new JTextArea();
+		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
+		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrBeispielWindows_1.setBackground(SystemColor.menu);
+		txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
+		panel_2.add(txtrBeispielWindows_1);
+		
+		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
+		lblWieVieleCpus.setBounds(10, 191, 280, 20);
+		panel_2.add(lblWieVieleCpus);
+		
+		JLabel label_3 = new JLabel("mindestens");
+		label_3.setBounds(315, 191, 60, 20);
+		panel_2.add(label_3);
+		
+		spinnerCPU = new JSpinner();
+		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
+		spinnerCPU.setBounds(385, 188, 29, 20);
+		panel_2.add(spinnerCPU);
+		
+		JLabel lblKerne = new JLabel("Kerne");
+		lblKerne.setBounds(424, 191, 46, 20);
+		panel_2.add(lblKerne);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						
+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+
+						FTPUploader_GUI ea=new FTPUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
index 2a77b2a7..2722fa51 100644
--- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
@@ -243,7 +243,7 @@ public class EingabeSystemDaten extends JFrame {
 						vm.vl.setLongDesc(longDesc.getText());

 						vm.vl.setOS(choiceOS.getSelectedItem());

 						vm.vl.setShortDesc(shortDesc.getText());

-						EingabeAllgemein ea= new EingabeAllgemein();

+						EingabeImageAllgemein_GUI ea= new EingabeImageAllgemein_GUI();

 						ea.setVisible(true);

 						dispose();

 					}

diff --git a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
new file mode 100644
index 00000000..4ba0aa0d
--- /dev/null
+++ b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
@@ -0,0 +1,241 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import Models.Image;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.JCheckBox;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+
+@SuppressWarnings("serial")
+public class ExtendedSearch_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField textField;
+	private JTextField textField_1;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			ExtendedSearch_GUI dialog = new ExtendedSearch_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public ExtendedSearch_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Weitere Suchoptionen");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("beschreibung");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Image-Typ", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 11, 557, 95);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Image-Typ");
+		lblNewLabel_2.setBounds(10, 39, 176, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		JCheckBox chckbxBestehendesImage = new JCheckBox("Bestehendes Image");
+		chckbxBestehendesImage.setSelected(true);
+		chckbxBestehendesImage.setBounds(192, 38, 138, 23);
+		panel_1.add(chckbxBestehendesImage);
+		
+		JCheckBox chckbxRohling = new JCheckBox("Rohling");
+		chckbxRohling.setSelected(true);
+		chckbxRohling.setBounds(332, 38, 97, 23);
+		panel_1.add(chckbxRohling);
+		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Image-Inhalt", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 117, 557, 95);
+		contentPanel.add(panel);
+		
+		JLabel lblEnthalteneSoftware = new JLabel("Enthaltene Software");
+		lblEnthalteneSoftware.setBounds(10, 39, 176, 20);
+		panel.add(lblEnthalteneSoftware);
+		
+		textField = new JTextField();
+		textField.setBounds(196, 39, 351, 20);
+		panel.add(textField);
+		textField.setColumns(10);
+		
+		JLabel lblNewLabel_1 = new JLabel("Bitte mit ; getrennt angeben");
+		lblNewLabel_1.setBounds(196, 70, 351, 14);
+		panel.add(lblNewLabel_1);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 223, 557, 123);
+		contentPanel.add(panel_2);
+		
+		JLabel lblNachnameDesErstellers = new JLabel("Nachname des Erstellers");
+		lblNachnameDesErstellers.setBounds(10, 39, 176, 20);
+		panel_2.add(lblNachnameDesErstellers);
+		
+		textField_1 = new JTextField();
+		textField_1.setColumns(10);
+		textField_1.setBounds(196, 39, 351, 20);
+		panel_2.add(textField_1);
+		
+		JLabel lblHochschuleuniversitt = new JLabel("Hochschule/Universit\u00E4t");
+		lblHochschuleuniversitt.setBounds(10, 70, 176, 20);
+		panel_2.add(lblHochschuleuniversitt);
+		
+		JComboBox comboBox = new JComboBox();
+		comboBox.setBounds(196, 70, 351, 20);
+		panel_2.add(comboBox);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						
+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("\u00DCbernehmen");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+
+						FTPUploader_GUI ea=new FTPUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index 796e3798..60e509e2 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -1,293 +1,349 @@
-package GUI;

-

-import java.awt.BorderLayout;

-import java.awt.Color;

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import java.io.File;

-import java.rmi.RemoteException;

-

-import javax.swing.JButton;

-import javax.swing.JFileChooser;

-import javax.swing.JFrame;

-import javax.swing.JLabel;

-import javax.swing.JPanel;

-import javax.swing.JProgressBar;

-import javax.swing.SwingConstants;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-

-import Models.User;

-

-import rmi.RmiClientMethods;

-import server.ServerInterface;

-import downloader.DownloadTask;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.beans.PropertyChangeEvent;

-import java.beans.PropertyChangeListener;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-@SuppressWarnings("serial")

-public class FTPDownloader extends JFrame implements PropertyChangeListener {

-

-	@SuppressWarnings("unused")

-	private JPanel contentPane;

-	private final JPanel contentPanel = new JPanel();

-	JLabel lblNewLabel;

-	JLabel downspeed;

-	User user;

-	JProgressBar progressBar;

-	String host="141.79.128.121";

-	int port=21;

-	String username="openslx";

-	String password="openslx-ng";

-	String downloadPath="";

-	String filename="";

-	static String arg="";

-	DownloadTask task;

-	JLabel bytesreadlbl;

-	JLabel lblNewLabel_3;

-	JLabel labelVerbleibend;

-	long filesize;

-	double speed;

-	long bytesread;

-	JLabel labelZeit; 

-	boolean taskrun=false;

-    RmiClientMethods rmi=new RmiClientMethods();

-    ServerInterface sint=rmi.getInterface();

-	/**

-	 * Launch the application.

-	 */

-	/*public static void main(String[] args) {

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					FTPDownloader frame = new FTPDownloader();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

-	}*/

-

-	/**

-	 * Create the frame.

-	 */

-	public FTPDownloader(String name) {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				if(taskrun==true)

-				{

-					try {

-						sint.DeleteFtpUser(user.getUsername());

-					} catch (RemoteException e1) {

-						// TODO Auto-generated catch block

-						e1.printStackTrace();

-					}

-				task.cancel(true);

-				}

-				dispose();

-			}

-		});

-		setResizable(false);

-		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-		

-		filename=name;

-		

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	

-		//filename=name;

-		setBackground(Color.WHITE);

-		setTitle("Dozentenmodul *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 603) / 2;

-		int left=(screenSize.width - 250) / 2;

-		setBounds(left, top, 603, 250);

-		//setBounds(100, 100, 603, 250);

-		getContentPane().setLayout(new BorderLayout());

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel, BorderLayout.CENTER);

-		contentPanel.setLayout(null);

-		{

-			JButton btnSpeicherortAuswhlen = new JButton("Speicherort ausw\u00E4hlen");

-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {

-				public void actionPerformed(ActionEvent arg0) {

-					JFileChooser fc=new JFileChooser();

-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);

-					

-					fc.showOpenDialog(getParent());

-					File dir=fc.getSelectedFile();

-					lblNewLabel.setText(dir.getAbsolutePath());

-				}

-			});

-

-			btnSpeicherortAuswhlen.setBounds(10, 11, 141, 23);

-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);

-			contentPanel.add(btnSpeicherortAuswhlen);

-		}

-		

-		lblNewLabel = new JLabel("C:\\");

-		lblNewLabel.setBounds(169, 11, 255, 23);

-		contentPanel.add(lblNewLabel);

-		

-		JButton btnDownloadStarten = new JButton("Download starten");

-		btnDownloadStarten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				buttonDownloadActionPerformed(arg0);

-			}

-		});

-

-		btnDownloadStarten.setBounds(10, 155, 141, 23);

-		contentPanel.add(btnDownloadStarten);

-		

-		progressBar = new JProgressBar(0,100);

-		progressBar.setStringPainted(true);

-

-		

-		progressBar.setBounds(10, 45, 577, 30);

-		contentPanel.add(progressBar);

-		

-		JLabel lblDownloadgeschwindigkeit = new JLabel("Downloadgeschwindigkeit:");

-		lblDownloadgeschwindigkeit.setBounds(10, 81, 141, 14);

-		contentPanel.add(lblDownloadgeschwindigkeit);

-		

-		downspeed = new JLabel("0");

-		downspeed.setBounds(169, 81, 95, 14);

-		contentPanel.add(downspeed);

-		

-		JLabel lblNewLabel_1 = new JLabel("Fertig:");

-		lblNewLabel_1.setBounds(10, 106, 46, 14);

-		contentPanel.add(lblNewLabel_1);

-		

-		bytesreadlbl = new JLabel("");

-		bytesreadlbl.setBounds(66, 106, 108, 14);

-		contentPanel.add(bytesreadlbl);

-		

-		JLabel lblNewLabel_2 = new JLabel("von:");

-		lblNewLabel_2.setBounds(179, 106, 46, 14);

-		contentPanel.add(lblNewLabel_2);

-		

-		lblNewLabel_3 = new JLabel("");

-		lblNewLabel_3.setBounds(235, 106, 108, 14);

-		contentPanel.add(lblNewLabel_3);

-		

-		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");

-		lblMbVerbleibend.setBounds(353, 106, 71, 14);

-		contentPanel.add(lblMbVerbleibend);

-		

-		labelVerbleibend = new JLabel("");

-		labelVerbleibend.setBounds(434, 106, 108, 14);

-		contentPanel.add(labelVerbleibend);

-		

-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");

-		lblGeschtzteVerbleibendeZeit.setBounds(274, 81, 150, 14);

-		contentPanel.add(lblGeschtzteVerbleibendeZeit);

-		

-		labelZeit = new JLabel("");

-		labelZeit.setBounds(425, 81, 117, 14);

-		contentPanel.add(labelZeit);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBackground(UIManager.getColor("Button.background"));

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane, BorderLayout.SOUTH);

-			{

-				JButton cancelButton = new JButton("Schlie\u00DFen");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(taskrun==true)

-						{

-						task.cancel(true);

-						try {

-							sint.DeleteFtpUser(user.getUsername());

-						} catch (RemoteException e1) {

-							// TODO Auto-generated catch block

-							e1.printStackTrace();

-						}

-						}

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		setVisible(true);

-		

-	}

-	

-    private void buttonDownloadActionPerformed(ActionEvent event) {

- 

-        progressBar.setValue(0);

-

-        try {

-        	user=sint.getFtpUser();

-			downloadPath=sint.getPathOfImage(filename);

-		} catch (RemoteException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-        System.out.println(user.getUsername()+"Pass:"+user.getPass());

-        

-        task = new DownloadTask(host, port, user.getUsername(), user.getPass(),downloadPath+filename+".vmdk", lblNewLabel.getText(), this);

-        System.out.println(downloadPath+filename);

-        task.addPropertyChangeListener(this);

-        task.execute();

-        taskrun=true;

-

-    }

-    

-	public void propertyChange(PropertyChangeEvent arg0) {

-

-		

-        if ("progress" == arg0.getPropertyName()) {

-            int progress = (Integer) arg0.getNewValue();

-            progressBar.setValue(progress);

-        }

-        if("speed"==arg0.getPropertyName()){

-        	speed=(double)arg0.getNewValue();

-        	//if(speed<=1){

-        		

-        		downspeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");

-        		

-        //	}else

-        	//{

-        		//double MBSpeed=speed/1024;

-        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));

-        	//}

-        	

-        }

-        if("bytesread"==arg0.getPropertyName())

-        {

-        	bytesread=(long)arg0.getNewValue();

-        	bytesreadlbl.setText((bytesread/1024/1024)+" MB");

-        	labelVerbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");

-        	

-        	

-        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");

-        	

-        

-        }

-        if("filesize"==arg0.getPropertyName())

-        {

-        	filesize=(long)arg0.getNewValue();

-        	lblNewLabel_3.setText((filesize/1024/1024)+" MB");

-        	

-        }

-		

-	}

+package GUI;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.io.File;
+import java.rmi.RemoteException;
+
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+
+import Models.User;
+
+import rmi.RmiClientMethods;
+import server.ServerInterface;
+import downloader.DownloadTask;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.SystemColor;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import javax.swing.JSeparator;
+
+@SuppressWarnings("serial")
+public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener {
+
+	@SuppressWarnings("unused")
+	private JPanel contentPane;
+	private final JPanel contentPanel = new JPanel();
+	JLabel lblNewLabel;
+	JLabel downspeed;
+	User user;
+	JProgressBar progressBar;
+	String host="141.79.128.121";
+	int port=21;
+	String username="openslx";
+	String password="openslx-ng";
+	String downloadPath="";
+	String filename="";
+	static String arg="";
+	DownloadTask task;
+	JLabel bytesreadlbl;
+	JLabel lblNewLabel_3;
+	JLabel labelVerbleibend;
+	long filesize;
+	double speed;
+	long bytesread;
+	JLabel labelZeit; 
+	boolean taskrun=false;
+    RmiClientMethods rmi=new RmiClientMethods();
+    ServerInterface sint=rmi.getInterface();
+	/**
+	 * Launch the application.
+	 */
+	/*public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					FTPDownloader frame = new FTPDownloader();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}*/
+
+	/**
+	 * Create the frame.
+	 */
+	public FTPDownloader_GUI(String name) {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				if(taskrun==true)
+				{
+					try {
+						sint.DeleteFtpUser(user.getUsername());
+					} catch (RemoteException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+				task.cancel(true);
+				}
+				dispose();
+			}
+		});
+		setResizable(false);
+		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		
+		filename=name;
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	
+		//filename=name;
+		setBackground(Color.WHITE);
+		setTitle("Dozentenmodul *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 250);
+		getContentPane().setLayout(new BorderLayout());
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel, BorderLayout.CENTER);
+		contentPanel.setLayout(null);
+		{
+			JButton btnSpeicherortAuswhlen = new JButton("Speicherort ausw\u00E4hlen");
+			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent arg0) {
+					JFileChooser fc=new JFileChooser();
+					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+					
+					fc.showOpenDialog(getParent());
+					File dir=fc.getSelectedFile();
+					lblNewLabel.setText(dir.getAbsolutePath());
+				}
+			});
+
+			btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23);
+			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
+			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
+			contentPanel.add(btnSpeicherortAuswhlen);
+		}
+		
+		lblNewLabel = new JLabel("C:\\");
+		lblNewLabel.setBounds(169, 124, 255, 23);
+		contentPanel.add(lblNewLabel);
+		
+		JButton btnDownloadStarten = new JButton("Download starten");
+		btnDownloadStarten.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				buttonDownloadActionPerformed(arg0);
+			}
+		});
+
+		btnDownloadStarten.setBounds(10, 294, 141, 23);
+		contentPanel.add(btnDownloadStarten);
+		
+		progressBar = new JProgressBar(0,100);
+		progressBar.setStringPainted(true);
+
+		
+		progressBar.setBounds(10, 158, 577, 30);
+		contentPanel.add(progressBar);
+		
+		JLabel lblDownloadgeschwindigkeit = new JLabel("Downloadgeschwindigkeit:");
+		lblDownloadgeschwindigkeit.setBounds(10, 194, 141, 14);
+		contentPanel.add(lblDownloadgeschwindigkeit);
+		
+		downspeed = new JLabel("0");
+		downspeed.setBounds(261, 194, 95, 14);
+		contentPanel.add(downspeed);
+		
+		JLabel lblNewLabel_1 = new JLabel("Fertig:");
+		lblNewLabel_1.setBounds(10, 244, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		bytesreadlbl = new JLabel("");
+		bytesreadlbl.setBounds(66, 244, 108, 14);
+		contentPanel.add(bytesreadlbl);
+		
+		JLabel lblNewLabel_2 = new JLabel("von:");
+		lblNewLabel_2.setBounds(179, 244, 46, 14);
+		contentPanel.add(lblNewLabel_2);
+		
+		lblNewLabel_3 = new JLabel("");
+		lblNewLabel_3.setBounds(235, 244, 108, 14);
+		contentPanel.add(lblNewLabel_3);
+		
+		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
+		lblMbVerbleibend.setBounds(10, 269, 71, 14);
+		contentPanel.add(lblMbVerbleibend);
+		
+		labelVerbleibend = new JLabel("");
+		labelVerbleibend.setBounds(91, 269, 108, 14);
+		contentPanel.add(labelVerbleibend);
+		
+		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
+		lblGeschtzteVerbleibendeZeit.setBounds(10, 219, 150, 14);
+		contentPanel.add(lblGeschtzteVerbleibendeZeit);
+		
+		labelZeit = new JLabel("");
+		labelZeit.setBounds(261, 219, 117, 14);
+		contentPanel.add(labelZeit);
+		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 11, 577, 57);
+		contentPanel.add(panel);
+		
+		JLabel label = new JLabel("Eingabe Ihrer Daten");
+		label.setFont(new Font("Tahoma", Font.BOLD, 18));
+		label.setBounds(10, 11, 509, 22);
+		panel.add(label);
+		
+		JTextPane textPane = new JTextPane();
+		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+		textPane.setEditable(false);
+		textPane.setBackground(SystemColor.menu);
+		textPane.setBounds(10, 36, 509, 32);
+		panel.add(textPane);
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 79, 597, 2);
+		contentPanel.add(separator);
+		
+		JLabel label_1 = new JLabel("Hauptmen\u00FC");
+		label_1.setForeground(Color.BLUE);
+		label_1.setBounds(20, 88, 61, 20);
+		contentPanel.add(label_1);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(80, 91, 14, 14);
+		contentPanel.add(label_2);
+		
+		JLabel label_3 = new JLabel("VL-Image");
+		label_3.setForeground(Color.BLUE);
+		label_3.setBounds(91, 88, 46, 20);
+		contentPanel.add(label_3);
+		
+		JLabel label_4 = new JLabel(">");
+		label_4.setBounds(139, 91, 14, 14);
+		contentPanel.add(label_4);
+		
+		JLabel label_5 = new JLabel("Neu/Bearbeiten");
+		label_5.setBounds(149, 91, 108, 14);
+		contentPanel.add(label_5);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(-10, 648, 597, 2);
+		contentPanel.add(separator_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBackground(UIManager.getColor("Button.background"));
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane, BorderLayout.SOUTH);
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						if(taskrun==true)
+						{
+						task.cancel(true);
+						try {
+							sint.DeleteFtpUser(user.getUsername());
+						} catch (RemoteException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}
+						}
+						dispose();
+					}
+				});
+				
+				JButton btnZurck = new JButton("Zur\u00FCck");
+				btnZurck.setActionCommand("Cancel");
+				buttonPane.add(btnZurck);
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		setVisible(true);
+		
+	}
+	
+    private void buttonDownloadActionPerformed(ActionEvent event) {
+ 
+        progressBar.setValue(0);
+
+        try {
+        	user=sint.getFtpUser();
+			downloadPath=sint.getPathOfImage(filename);
+		} catch (RemoteException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        System.out.println(user.getUsername()+"Pass:"+user.getPass());
+        
+        task = new DownloadTask(host, port, user.getUsername(), user.getPass(),downloadPath+filename+".vmdk", lblNewLabel.getText(), this);
+        System.out.println(downloadPath+filename);
+        task.addPropertyChangeListener(this);
+        task.execute();
+        taskrun=true;
+
+    }
+    
+	public void propertyChange(PropertyChangeEvent arg0) {
+
+		
+        if ("progress" == arg0.getPropertyName()) {
+            int progress = (Integer) arg0.getNewValue();
+            progressBar.setValue(progress);
+        }
+        if("speed"==arg0.getPropertyName()){
+        	speed=(double)arg0.getNewValue();
+        	//if(speed<=1){
+        		
+        		downspeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");
+        		
+        //	}else
+        	//{
+        		//double MBSpeed=speed/1024;
+        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));
+        	//}
+        	
+        }
+        if("bytesread"==arg0.getPropertyName())
+        {
+        	bytesread=(long)arg0.getNewValue();
+        	bytesreadlbl.setText((bytesread/1024/1024)+" MB");
+        	labelVerbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");
+        	
+        	
+        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");
+        	
+        
+        }
+        if("filesize"==arg0.getPropertyName())
+        {
+        	filesize=(long)arg0.getNewValue();
+        	lblNewLabel_3.setText((filesize/1024/1024)+" MB");
+        	
+        }
+		
+	}
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index f92fa172..8baf19aa 100644
--- a/Dozentenmodul/src/GUI/FTPUploader.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -1,310 +1,373 @@
-package GUI;

-

-import java.awt.BorderLayout;

-import rmi.*;

-import server.ServerInterface;

-import java.awt.Color;

-import java.awt.Dimension;

-import java.awt.EventQueue;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import java.io.File;

-import java.rmi.RemoteException;

-import javax.swing.JButton;

-import javax.swing.JFileChooser;

-import javax.swing.JFrame;

-import javax.swing.JLabel;

-import javax.swing.JPanel;

-import javax.swing.JProgressBar;

-import javax.swing.SwingConstants;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import downloader.UploadTask;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.beans.PropertyChangeEvent;

-import java.beans.PropertyChangeListener;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import Models.User;

-

-@SuppressWarnings("serial")

-public class FTPUploader extends JFrame implements PropertyChangeListener {

-

-	@SuppressWarnings("unused")

-	private JPanel contentPane;

-	private final JPanel contentPanel = new JPanel();

-	JLabel lblNewLabel;

-	JProgressBar progressBar;

-	String host="141.79.128.121";

-	int port=21;

-	User user;

-	String filename="";

-	File uploadFile;

-	static String arg="";

-	 UploadTask task;

-	 JLabel UpSpeed;

-	 JLabel labelfertig;

-	 JLabel labelfilesize;

-	 JLabel labelZeit;

-	 JLabel labelverbleibend;

-		long filesize;

-		double speed;

-		long bytesread;

-		boolean taskrun=false;

-        RmiClientMethods rmi=new RmiClientMethods();

-        ServerInterface sint=rmi.getInterface();

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					FTPUploader frame = new FTPUploader();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

-	}

-

-	/**

-	 * Create the frame.

-	 */

-	public FTPUploader() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				if(taskrun==true)

-				{

-					try {

-						sint.DeleteFtpUser(user.getUsername());

-					} catch (RemoteException e1) {

-						// TODO Auto-generated catch block

-						e1.printStackTrace();

-					}

-				task.cancel(true);

-				}

-			}

-		});

-		setResizable(false);

-		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-		

-		

-		

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-		//filename=name;

-		setBackground(Color.WHITE);

-		setTitle("Dozentenmodul *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 603) / 2;

-		int left=(screenSize.width - 250) / 2;

-		setBounds(left, top, 603, 250);

-		//setBounds(100, 100, 603, 250);

-		getContentPane().setLayout(new BorderLayout());

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel, BorderLayout.CENTER);

-		contentPanel.setLayout(null);

-		{

-			JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");

-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {

-				public void actionPerformed(ActionEvent arg0) {

-					JFileChooser fc=new JFileChooser();

-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);

-					

-					fc.showOpenDialog(getParent());

-					File dir=fc.getSelectedFile();

-					uploadFile=dir;

-					filename=uploadFile.getName();

-					lblNewLabel.setText(dir.getAbsolutePath());

-				}

-			});

-

-			btnSpeicherortAuswhlen.setBounds(10, 11, 141, 23);

-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);

-			contentPanel.add(btnSpeicherortAuswhlen);

-		}

-		

-		lblNewLabel = new JLabel("");

-		lblNewLabel.setBounds(169, 11, 255, 23);

-		contentPanel.add(lblNewLabel);

-		

-		JButton btnDownloadStarten = new JButton("Upload starten");

-		btnDownloadStarten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				buttonUploadActionPerformed(arg0);

-				

-			}

-		});

-

-		btnDownloadStarten.setBounds(10, 155, 141, 23);

-		contentPanel.add(btnDownloadStarten);

-		

-		progressBar = new JProgressBar(0,100);

-		progressBar.setStringPainted(true);

-

-		

-		progressBar.setBounds(10, 45, 577, 30);

-		contentPanel.add(progressBar);

-		

-		JLabel label = new JLabel("Downloadgeschwindigkeit:");

-		label.setBounds(10, 89, 141, 14);

-		contentPanel.add(label);

-		

-		JLabel label_1 = new JLabel("Fertig:");

-		label_1.setBounds(10, 114, 46, 14);

-		contentPanel.add(label_1);

-		

-		labelfertig = new JLabel("");

-		labelfertig.setBounds(66, 114, 108, 14);

-		contentPanel.add(labelfertig);

-		

-		UpSpeed = new JLabel("0");

-		UpSpeed.setBounds(169, 89, 95, 14);

-		contentPanel.add(UpSpeed);

-		

-		JLabel label_4 = new JLabel("von:");

-		label_4.setBounds(179, 114, 46, 14);

-		contentPanel.add(label_4);

-		

-		labelfilesize = new JLabel("");

-		labelfilesize.setBounds(235, 114, 108, 14);

-		contentPanel.add(labelfilesize);

-		

-		JLabel label_6 = new JLabel("Verbleibend:");

-		label_6.setBounds(353, 114, 71, 14);

-		contentPanel.add(label_6);

-		

-		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");

-		label_7.setBounds(274, 89, 150, 14);

-		contentPanel.add(label_7);

-		

-		labelZeit = new JLabel("");

-		labelZeit.setBounds(425, 89, 117, 14);

-		contentPanel.add(labelZeit);

-		

-		labelverbleibend = new JLabel("");

-		labelverbleibend.setBounds(434, 114, 108, 14);

-		contentPanel.add(labelverbleibend);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBackground(UIManager.getColor("Button.background"));

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane, BorderLayout.SOUTH);

-			{

-				JButton cancelButton = new JButton("Schlie\u00DFen");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						dispose();

-						if(taskrun==true)

-						{

-						try {

-							sint.DeleteFtpUser(user.getUsername());

-						} catch (RemoteException e1) {

-							// TODO Auto-generated catch block

-							e1.printStackTrace();

-						}

-						task.cancel(true);

-						}

-						

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		setVisible(true);

-		

-	}

-	

-    private void buttonUploadActionPerformed(ActionEvent event) {

-		// File (or directory) with old name

-	   // File file = new File(lblNewLabel.getText());

-

-	    // File (or directory) with new name

-	    //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");

-	    //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");

-	    

-

-	    // Rename file (or directory)

-	    //boolean success = file.renameTo(file2);

-	    //if (!success) {

-	        // File was not successfully renamed

-	    	//System.out.println("Not OK");

-	    //}

-	    //else

-	    //{

-	    	//System.out.println("OK");

-	    //}

-        progressBar.setValue(0);

-

-        try {

-			user=sint.getFtpUser();

-		} catch (RemoteException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-        task=new UploadTask(host,port,user.getUsername(),user.getPass(),user.getPath(), uploadFile);

-        task.addPropertyChangeListener(this);

-        task.execute();

-        taskrun=true;

-        

-        //createXML();

-        //TransferToSatellit();

-        

-    	

-    }

-

-	public void propertyChange(PropertyChangeEvent arg0) {

-        if ("progress" == arg0.getPropertyName()) {

-            int progress = (Integer) arg0.getNewValue();

-            progressBar.setValue(progress);

-        }

-        if("speed"==arg0.getPropertyName()){

-        	speed=(double)arg0.getNewValue();

-        	//if(speed<=1){

-        		

-        		UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");

-        		

-        //	}else

-        	//{

-        		//double MBSpeed=speed/1024;

-        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));

-        	//}

-        	

-        }

-        if("bytesread"==arg0.getPropertyName())

-        {

-        	bytesread=(long)arg0.getNewValue();

-        	labelfertig.setText((bytesread/1024/1024)+" MB");

-        	labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");

-        	

-        	

-        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");

-        	

-        

-        }

-        if("filesize"==arg0.getPropertyName())

-        {

-        	filesize=(long)arg0.getNewValue();

-        	labelfilesize.setText((filesize/1024/1024)+" MB");

-        	

-        }

-		

-	}

-	

-

+package GUI;
+
+import java.awt.BorderLayout;
+import rmi.*;
+import server.ServerInterface;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.io.File;
+import java.rmi.RemoteException;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import downloader.UploadTask;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import Models.User;
+import java.awt.SystemColor;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JSeparator;
+
+
+@SuppressWarnings("serial")
+public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
+
+	@SuppressWarnings("unused")
+	private JPanel contentPane;
+	private final JPanel contentPanel = new JPanel();
+	JLabel lblNewLabel;
+	JProgressBar progressBar;
+	String host="141.79.128.121";
+	int port=21;
+	User user;
+	String filename="";
+	File uploadFile;
+	static String arg="";
+	UploadTask task;
+	JLabel UpSpeed;
+	JLabel labelfertig;
+	JLabel labelfilesize;
+	JLabel labelZeit;
+	JLabel labelverbleibend;
+	long filesize;
+	double speed;
+	long bytesread;
+	boolean taskrun=false;
+    RmiClientMethods rmi=new RmiClientMethods();
+    ServerInterface sint=rmi.getInterface();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					FTPUploader_GUI frame = new FTPUploader_GUI();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * Create the frame.
+	 */
+	public FTPUploader_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				if(taskrun==true)
+				{
+					try {
+						sint.DeleteFtpUser(user.getUsername());
+					} catch (RemoteException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+				task.cancel(true);
+				}
+			}
+		});
+		setResizable(false);
+		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		
+		
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		//filename=name;
+		setBackground(Color.WHITE);
+		setTitle("Dozentenmodul *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 250);
+		getContentPane().setLayout(new BorderLayout());
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel, BorderLayout.CENTER);
+		contentPanel.setLayout(null);
+		{
+			JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
+			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent arg0) {
+					JFileChooser fc=new JFileChooser();
+					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+					
+					fc.showOpenDialog(getParent());
+					File dir=fc.getSelectedFile();
+					uploadFile=dir;
+					filename=uploadFile.getName();
+					lblNewLabel.setText(dir.getAbsolutePath());
+				}
+			});
+
+			btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23);
+			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
+			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
+			contentPanel.add(btnSpeicherortAuswhlen);
+		}
+		
+		lblNewLabel = new JLabel("");
+		lblNewLabel.setBounds(184, 124, 255, 23);
+		contentPanel.add(lblNewLabel);
+		
+		JButton btnDownloadStarten = new JButton("Upload starten");
+		btnDownloadStarten.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				buttonUploadActionPerformed(arg0);
+				
+			}
+		});
+
+		btnDownloadStarten.setBounds(10, 330, 141, 23);
+		contentPanel.add(btnDownloadStarten);
+		
+		progressBar = new JProgressBar(0,100);
+		progressBar.setStringPainted(true);
+
+		
+		progressBar.setBounds(10, 158, 577, 30);
+		contentPanel.add(progressBar);
+		
+		JLabel label = new JLabel("Downloadgeschwindigkeit:");
+		label.setBounds(10, 199, 141, 14);
+		contentPanel.add(label);
+		
+		JLabel label_1 = new JLabel("Fertig:");
+		label_1.setBounds(10, 249, 46, 14);
+		contentPanel.add(label_1);
+		
+		labelfertig = new JLabel("0");
+		labelfertig.setBounds(66, 249, 108, 14);
+		contentPanel.add(labelfertig);
+		
+		UpSpeed = new JLabel("0");
+		UpSpeed.setBounds(329, 199, 95, 14);
+		contentPanel.add(UpSpeed);
+		
+		JLabel label_4 = new JLabel("von:");
+		label_4.setBounds(184, 249, 46, 14);
+		contentPanel.add(label_4);
+		
+		labelfilesize = new JLabel("0");
+		labelfilesize.setBounds(240, 249, 108, 14);
+		contentPanel.add(labelfilesize);
+		
+		JLabel label_6 = new JLabel("Verbleibend:");
+		label_6.setBounds(10, 274, 71, 14);
+		contentPanel.add(label_6);
+		
+		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
+		label_7.setBounds(10, 224, 150, 14);
+		contentPanel.add(label_7);
+		
+		labelZeit = new JLabel("0");
+		labelZeit.setBounds(329, 224, 117, 14);
+		contentPanel.add(labelZeit);
+		
+		labelverbleibend = new JLabel("0");
+		labelverbleibend.setBounds(91, 274, 108, 14);
+		contentPanel.add(labelverbleibend);
+		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 11, 577, 57);
+		contentPanel.add(panel);
+		
+		JLabel label_2 = new JLabel("Eingabe Ihrer Daten");
+		label_2.setFont(new Font("Tahoma", Font.BOLD, 18));
+		label_2.setBounds(10, 11, 509, 22);
+		panel.add(label_2);
+		
+		JTextPane textPane = new JTextPane();
+		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+		textPane.setEditable(false);
+		textPane.setBackground(SystemColor.menu);
+		textPane.setBounds(10, 36, 509, 32);
+		panel.add(textPane);
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 79, 597, 2);
+		contentPanel.add(separator);
+		
+		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
+		lblNewLabel_1.setForeground(Color.BLUE);
+		lblNewLabel_1.setBounds(20, 88, 61, 20);
+		contentPanel.add(lblNewLabel_1);
+		
+		JLabel label_3 = new JLabel(">");
+		label_3.setBounds(80, 91, 14, 14);
+		contentPanel.add(label_3);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(91, 88, 46, 20);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_5 = new JLabel(">");
+		label_5.setBounds(139, 91, 14, 14);
+		contentPanel.add(label_5);
+		
+		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");
+		lblNeubearbeiten.setBounds(149, 91, 108, 14);
+		contentPanel.add(lblNeubearbeiten);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		contentPanel.add(separator_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBackground(UIManager.getColor("Button.background"));
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane, BorderLayout.SOUTH);
+			{
+				JButton ButtonReady = new JButton("Abschlie\u00DFen");
+				ButtonReady.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						dispose();
+						if(taskrun==true)
+						{
+						try {
+							sint.DeleteFtpUser(user.getUsername());
+						} catch (RemoteException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}
+						task.cancel(true);
+						}
+						
+					}
+				});
+				
+				JButton buttonCancel = new JButton("Schlie\u00DFen");
+				buttonCancel.setActionCommand("Cancel");
+				buttonPane.add(buttonCancel);
+				ButtonReady.setActionCommand("Cancel");
+				buttonPane.add(ButtonReady);
+			}
+		}
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnHillfe = new JMenu("Hillfe");
+		menuBar.add(mnHillfe);
+		setVisible(true);
+		
+	}
+	
+    private void buttonUploadActionPerformed(ActionEvent event) {
+		// File (or directory) with old name
+	   // File file = new File(lblNewLabel.getText());
+
+	    // File (or directory) with new name
+	    //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");
+	    //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");
+	    
+
+	    // Rename file (or directory)
+	    //boolean success = file.renameTo(file2);
+	    //if (!success) {
+	        // File was not successfully renamed
+	    	//System.out.println("Not OK");
+	    //}
+	    //else
+	    //{
+	    	//System.out.println("OK");
+	    //}
+        progressBar.setValue(0);
+
+        try {
+			user=sint.getFtpUser();
+		} catch (RemoteException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+        task=new UploadTask(host,port,user.getUsername(),user.getPass(),user.getPath(), uploadFile);
+        task.addPropertyChangeListener(this);
+        task.execute();
+        taskrun=true;
+        
+        //createXML();
+        //TransferToSatellit();
+        
+    	
+    }
+
+	public void propertyChange(PropertyChangeEvent arg0) {
+        if ("progress" == arg0.getPropertyName()) {
+            int progress = (Integer) arg0.getNewValue();
+            progressBar.setValue(progress);
+        }
+        if("speed"==arg0.getPropertyName()){
+        	speed=(double)arg0.getNewValue();
+        	//if(speed<=1){
+        		
+        		UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");
+        		
+        //	}else
+        	//{
+        		//double MBSpeed=speed/1024;
+        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));
+        	//}
+        	
+        }
+        if("bytesread"==arg0.getPropertyName())
+        {
+        	bytesread=(long)arg0.getNewValue();
+        	labelfertig.setText((bytesread/1024/1024)+" MB");
+        	labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");
+        	
+        	
+        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");
+        	
+        
+        }
+        if("filesize"==arg0.getPropertyName())
+        {
+        	filesize=(long)arg0.getNewValue();
+        	labelfilesize.setText((filesize/1024/1024)+" MB");
+        	
+        }
+		
+	}
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index 2e0dadb9..2364d101 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -39,6 +39,7 @@ public class MainMenue_GUI extends JFrame {
 	String[] result;

 	JRadioButton rdbtnImageNew;

 	JRadioButton rdbtnImageEdit;

+	JRadioButton rdbtnImageSearchDownload;

 	private final ButtonGroup buttonGroup = new ButtonGroup();

 	/**

 	 * Launch the application.

@@ -137,7 +138,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnImageDelete.setBounds(6, 74, 185, 23);

 		panelImage.add(rdbtnImageDelete);

 		

-		JRadioButton rdbtnImageSearchDownload = new JRadioButton("Suche und Download");

+		rdbtnImageSearchDownload = new JRadioButton("Suche und Download");

 		buttonGroup.add(rdbtnImageSearchDownload);

 		rdbtnImageSearchDownload.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

 		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);

@@ -269,13 +270,18 @@ public class MainMenue_GUI extends JFrame {
 						

 						if(rdbtnImageNew.isSelected()==true)

 						{

-						searchRohling sr=new searchRohling();

+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();

 						sr.setVisible(true);

 						dispose();

-						}else if(rdbtnImageEdit.isSelected()==true)

+						} else if(rdbtnImageEdit.isSelected()==true)

 						{

-							EingabeAllgemein ea = new EingabeAllgemein();

-							ea.setVisible(true);

+							SearchImage_GUI si=new SearchImage_GUI();

+							si.setVisible(true);

+							dispose();

+						}else if(rdbtnImageSearchDownload.isSelected()==true)

+						{

+							SearchMethod_GUI sm=new SearchMethod_GUI();

+							sm.setVisible(true);

 							dispose();

 						}

 					}

diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
new file mode 100644
index 00000000..ca3329b2
--- /dev/null
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -0,0 +1,375 @@
+package GUI;
+
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.ScrollPaneLayout;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import Models.Image;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.JTextField;
+import javax.swing.JTabbedPane;
+import java.awt.Panel;
+import javax.swing.JTable;
+import javax.swing.plaf.basic.BasicTabbedPaneUI.TabbedPaneLayout;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.JScrollPane;
+import java.awt.ScrollPane;
+
+@SuppressWarnings("serial")
+public class SearchImage_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	private JTextField textFieldName;
+	private JTextField textFieldOS;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			SearchImage_GUI dialog = new SearchImage_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public SearchImage_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 531);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 49, 557, 131);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		panel_1.add(lblInternetIstInnerhalb);
+		
+		textFieldName = new JTextField();
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+		
+		textFieldOS = new JTextField();
+		textFieldOS.setColumns(10);
+		textFieldOS.setBounds(270, 58, 250, 20);
+		panel_1.add(textFieldOS);
+		
+		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+				es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+		
+		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		panel_1.add(lblErweiterteSuche);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				SearchImage_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
+		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+
+		tabbedPane.setBounds(10, 197, 557, 300);
+		contentPanel.add(tabbedPane);
+		
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		JTable tablemyImages=new JTable();
+		tablemyImages.setModel(new DefaultTableModel(
+			new Object[][] {
+			},
+			new String[] {
+				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
+			}
+		));
+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+		
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+		JTable tableCoopImages=new JTable();
+		tableCoopImages.setModel(new DefaultTableModel(
+			new Object[][] {
+			},
+			new String[] {
+				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
+			}
+		));
+		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPaneCoopImages.setViewportView(tableCoopImages);
+		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
+		
+		JScrollPane scrollPanePublicImages = new JScrollPane();
+		JTable tablePublicImages=new JTable();
+		tablePublicImages.setModel(new DefaultTableModel(
+			new Object[][] {
+			},
+			new String[] {
+				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
+			}
+		));
+		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPanePublicImages.setViewportView(tablePublicImages);
+		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
+		
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+		JTable tablePublicVorlagen=new JTable();
+		tablePublicVorlagen.setModel(new DefaultTableModel(
+			new Object[][] {
+			},
+			new String[] {
+				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
+			}
+		));
+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
+		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
+		
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		JTable tableAllImages=new JTable();
+		tableAllImages.setModel(new DefaultTableModel(
+			new Object[][] {
+			},
+			new String[] {
+				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
+			}
+		));
+		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPaneAllImages.setViewportView(tableAllImages);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+		
+		JButton btnDownload = new JButton("Download");
+		btnDownload.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+				down.setVisible(true);
+				SearchImage_GUI.this.setVisible(false);
+			}
+		});
+		btnDownload.setBounds(478, 508, 89, 23);
+		contentPanel.add(btnDownload);
+		
+		JButton btnFilterLschen = new JButton("Filter l\u00F6schen");
+		btnFilterLschen.setBounds(358, 508, 110, 23);
+		contentPanel.add(btnFilterLschen);
+
+
+
+		
+
+
+		
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						//Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
+						//Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						
+						MainMenue_GUI main=new MainMenue_GUI();
+						main.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+
+						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/SearchMethod_GUI.java b/Dozentenmodul/src/GUI/SearchMethod_GUI.java
new file mode 100644
index 00000000..b4aa5586
--- /dev/null
+++ b/Dozentenmodul/src/GUI/SearchMethod_GUI.java
@@ -0,0 +1,247 @@
+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import javax.swing.JTextField;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import Models.Image;
+import Models.person;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+
+@SuppressWarnings("serial")
+public class SearchMethod_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnNachEinemVlimage;
+	JRadioButton rdbtnNachEinerVeranstaltung;
+	private final ButtonGroup buttonGroup = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			SearchMethod_GUI dialog = new SearchMethod_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public SearchMethod_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		setResizable(false);
+		
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("bwLehrpool Suite *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 493);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Wählen Sie bitte die Suchmethode Ihrer Suche", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 36, 557, 369);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		rdbtnNachEinemVlimage = new JRadioButton("Nach einem VL-Image oder Vorlagen suchen");
+		buttonGroup.add(rdbtnNachEinemVlimage);
+		rdbtnNachEinemVlimage.setBounds(6, 38, 545, 23);
+		panel_1.add(rdbtnNachEinemVlimage);
+		
+		JTextArea txtrHierKlickenWenn = new JTextArea();
+		txtrHierKlickenWenn.setBackground(SystemColor.menu);
+		txtrHierKlickenWenn.setLineWrap(true);
+		txtrHierKlickenWenn.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrHierKlickenWenn.setText("Hier klicken, wenn Sie nach einem konkreten Image suchen, von dem Sie exakte Daten kennen. Hierzu geh\u00F6ren z.B. das Betriebssystem oder die installierte Software.\r\nEs werden zudem alle Vorlagen aufgelistet.");
+		txtrHierKlickenWenn.setBounds(25, 68, 518, 80);
+		panel_1.add(txtrHierKlickenWenn);
+		
+		JTextArea txtrHierKlickenWenn_1 = new JTextArea();
+		txtrHierKlickenWenn_1.setText("Hier klicken, wenn Sie nur wissen f\u00FCr welche Veranstaltung das gesuchte Image verwendet wird. Hierzu geh\u00F6ren z.B. der Name des Dozenten oder der Name der Veranstaltung.");
+		txtrHierKlickenWenn_1.setLineWrap(true);
+		txtrHierKlickenWenn_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+		txtrHierKlickenWenn_1.setBackground(SystemColor.menu);
+		txtrHierKlickenWenn_1.setBounds(25, 210, 518, 80);
+		panel_1.add(txtrHierKlickenWenn_1);
+		
+		rdbtnNachEinerVeranstaltung = new JRadioButton("Nach einer Veranstaltung suchen");
+		buttonGroup.add(rdbtnNachEinerVeranstaltung);
+		rdbtnNachEinerVeranstaltung.setBounds(6, 180, 545, 23);
+		panel_1.add(rdbtnNachEinerVeranstaltung);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 402, 577, 33);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				SearchMethod_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Suchmethode");
+		lblNewLabel_1.setBounds(146, 11, 82, 14);
+		contentPanel.add(lblNewLabel_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton okButton = new JButton("Zur\u00FCck");
+				okButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						MainMenue_GUI sr=new MainMenue_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+					
+						if(rdbtnNachEinemVlimage.isSelected()==true)
+						{
+						SearchImage_GUI ea=new SearchImage_GUI();
+						ea.setVisible(true);
+						dispose();
+						}
+						}
+
+					});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu = new JMenu("Suchen");
+		menuBar.add(mnNewMenu);
+		
+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+		mnNewMenu.add(mntmVlSuche);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java
index ff81a6c4..8668fe43 100644
--- a/Dozentenmodul/src/GUI/Summary.java
+++ b/Dozentenmodul/src/GUI/Summary.java
@@ -264,7 +264,7 @@ public class Summary extends JFrame {
 		JButton btnZurDateneingabe = new JButton("Daten \u00E4ndern");

 		btnZurDateneingabe.addActionListener(new ActionListener() {

 			public void actionPerformed(ActionEvent arg0) {

-				EingabeAllgemein ea=new EingabeAllgemein();

+				EingabeImageAllgemein_GUI ea=new EingabeImageAllgemein_GUI();

 				ea.setVisible(true);

 				setVisible(false);

 			}

@@ -411,7 +411,7 @@ public class Summary extends JFrame {
 		JButton btnUploadtoolStarten = new JButton("Uploadtool starten");

 		btnUploadtoolStarten.addActionListener(new ActionListener() {

 			public void actionPerformed(ActionEvent arg0) {

-				FTPUploader up=new FTPUploader();

+				FTPUploader_GUI up=new FTPUploader_GUI();

 				up.setVisible(true);

 			}

 		});

diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java
index 60637039..3c322901 100644
--- a/Dozentenmodul/src/GUI/searchRohling.java
+++ b/Dozentenmodul/src/GUI/searchRohling.java
@@ -160,7 +160,7 @@ public class searchRohling extends JFrame {
 		JButton btnDownload = new JButton("Download");

 		btnDownload.addActionListener(new ActionListener() {

 			public void actionPerformed(ActionEvent arg0) {

-				FTPDownloader ftp=new FTPDownloader(list.getItem(list.getSelectedIndex()).toString());

+				FTPDownloader_GUI ftp=new FTPDownloader_GUI(list.getItem(list.getSelectedIndex()).toString());

 				ftp.setVisible(true);

 			}

 		});

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
new file mode 100644
index 00000000..aafc7372
--- /dev/null
+++ b/Dozentenmodul/src/Models/Image.java
@@ -0,0 +1,54 @@
+package Models;
+
+public class Image {
+	
+	private String Imagename;
+	private boolean licenseneed;
+	private boolean internet;
+	private int ram;
+	private int cpu;
+	
+	public static Image image=new Image();
+	public String getImagename() {
+		return Imagename;
+	}
+
+	public void setImagename(String imagename) {
+		Imagename = imagename;
+	}
+
+	public boolean isLicenseneed() {
+		return licenseneed;
+	}
+
+	public void setLicenseneed(boolean licenseneed) {
+		this.licenseneed = licenseneed;
+	}
+
+	public boolean isInternet() {
+		return internet;
+	}
+
+	public void setInternet(boolean internet) {
+		this.internet = internet;
+	}
+
+	public int getRam() {
+		return ram;
+	}
+
+	public void setRam(int ram) {
+		this.ram = ram;
+	}
+
+	public int getCpu() {
+		return cpu;
+	}
+
+	public void setCpu(int cpu) {
+		this.cpu = cpu;
+	}
+	
+	
+
+}
diff --git a/Dozentenmodul/src/downloader/DownloadTask.java b/Dozentenmodul/src/downloader/DownloadTask.java
index aa76922a..9cae23ed 100644
--- a/Dozentenmodul/src/downloader/DownloadTask.java
+++ b/Dozentenmodul/src/downloader/DownloadTask.java
@@ -6,7 +6,7 @@ import java.io.InputStream;
 

 import javax.swing.JOptionPane;

 import javax.swing.SwingWorker;

-import GUI.FTPDownloader;

+import GUI.FTPDownloader_GUI;

 

 /**

  * Execute file download in a background thread and update the progress. 

@@ -26,11 +26,11 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 	private String saveDir;

 	

 	@SuppressWarnings("unused")

-	private FTPDownloader gui;

+	private FTPDownloader_GUI gui;

 	

 	public DownloadTask(String host, int port, String username,

 			String password, String downloadPath, String saveDir,

-			FTPDownloader gui) {

+			FTPDownloader_GUI gui) {

 		this.host = host;

 		this.port = port;

 		this.username = username;