Kommunikation von BwLehrpool Suite zu BwLehrpool Suite Server läuft nun über Thrift

56 files changed, 5946 insertions, 2993 deletions

diff --git a/Dozentenmodul/src/GUI/AddOS.java b/Dozentenmodul/src/GUI/AddOS.java
deleted file mode 100644
index 1642b05b..00000000
--- a/Dozentenmodul/src/GUI/AddOS.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package GUI;

-

-import java.awt.BorderLayout;

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import sql.sql;

-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 javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextField;

-import javax.swing.JComboBox;

-import javax.swing.JCheckBox;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.sql.Connection;

-import javax.swing.DefaultComboBoxModel;

-

-@SuppressWarnings("serial")

-public class AddOS extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	private JTextField textField;

-	private JTextField textField_1;

-	private JTextField textField_2;

-	@SuppressWarnings("rawtypes")

-	JComboBox comboBox;

-	JCheckBox checkBox;

-	sql sql=new sql();

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			AddOS dialog = new AddOS();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	public AddOS() {

-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-		setTitle("Dozentenmodul *Prototyp*");

-		

-			try {

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

-			} catch (ClassNotFoundException | InstantiationException

-					| IllegalAccessException | UnsupportedLookAndFeelException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-	

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

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

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

-		setBounds(left, top, 416, 300);

-		//setBounds(100, 100, 288, 300);

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

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

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

-		contentPanel.setLayout(null);

-		{

-			JLabel lblNewLabel = new JLabel("Betriebssystem hinzuf\u00FCgen");

-			lblNewLabel.setFont(new Font("Dialog", Font.PLAIN, 14));

-			lblNewLabel.setBounds(10, 11, 194, 25);

-			contentPanel.add(lblNewLabel);

-		}

-		{

-			JLabel lblHersteller = new JLabel("Hersteller:*");

-			lblHersteller.setBounds(10, 47, 100, 20);

-			contentPanel.add(lblHersteller);

-		}

-		{

-			textField = new JTextField();

-			textField.setBounds(120, 47, 270, 20);

-			contentPanel.add(textField);

-			textField.setColumns(10);

-		}

-		{

-			JLabel lblNewLabel_1 = new JLabel("Name:*");

-			lblNewLabel_1.setBounds(10, 78, 100, 20);

-			contentPanel.add(lblNewLabel_1);

-		}

-		{

-			textField_1 = new JTextField();

-			textField_1.setColumns(10);

-			textField_1.setBounds(120, 78, 270, 20);

-			contentPanel.add(textField_1);

-		}

-		{

-			JLabel lblVersion = new JLabel("Version:*");

-			lblVersion.setBounds(10, 109, 100, 20);

-			contentPanel.add(lblVersion);

-		}

-		{

-			textField_2 = new JTextField();

-			textField_2.setColumns(10);

-			textField_2.setBounds(120, 109, 270, 20);

-			contentPanel.add(textField_2);

-		}

-		{

-			JLabel lblArchitektur = new JLabel("Architektur:*");

-			lblArchitektur.setBounds(10, 140, 100, 20);

-			contentPanel.add(lblArchitektur);

-		}

-		

-		comboBox = new JComboBox();

-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"32-bit", "64-bit"}));

-		comboBox.setBounds(120, 140, 135, 20);

-		contentPanel.add(comboBox);

-		

-		JLabel lblLizenzpflichtig = new JLabel("Lizenzpflichtig:*");

-		lblLizenzpflichtig.setBounds(10, 171, 100, 20);

-		contentPanel.add(lblLizenzpflichtig);

-		

-		checkBox = new JCheckBox("");

-		checkBox.setBounds(120, 167, 97, 23);

-		contentPanel.add(checkBox);

-		{

-			JPanel buttonPane = new JPanel();

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

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

-			{

-				JButton okButton = new JButton("OK");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(textField.getText().isEmpty()==false&&textField_2.getText().isEmpty()==false&&comboBox.getSelectedIndex()!=-1&&textField_1.getText().isEmpty()==false)

-						{

-						int Kosten=0;

-						if(checkBox.isSelected()==true)

-						{

-							Kosten=1;

-						}

-						Connection con=sql.getConnection();

-

-						sql.AddOS(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString());

-

-						dispose();

-						

-						}

-						else

-						{

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

-									"Error", JOptionPane.ERROR_MESSAGE);	

-						}

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

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

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-	}

-}

diff --git a/Dozentenmodul/src/GUI/AddSoftware.java b/Dozentenmodul/src/GUI/AddSoftware.java
deleted file mode 100644
index 37a3a8bb..00000000
--- a/Dozentenmodul/src/GUI/AddSoftware.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package GUI;

-

-import java.awt.BorderLayout;

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import sql.sql;

-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 javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextField;

-import javax.swing.JComboBox;

-import javax.swing.JCheckBox;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.sql.Connection;

-import javax.swing.DefaultComboBoxModel;

-

-@SuppressWarnings("serial")

-public class AddSoftware extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	private JTextField textField;

-	private JTextField textField_1;

-	private JTextField textField_2;

-	@SuppressWarnings("rawtypes")

-	JComboBox comboBox;

-	JCheckBox checkBox;

-	sql sql=new sql();

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			AddSoftware dialog = new AddSoftware();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}*/

-

-	/**

-	 * Create the dialog.

-	 */

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	public AddSoftware() {

-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-		setTitle("Dozentenmodul *Prototyp*");

-		

-			try {

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

-			} catch (ClassNotFoundException | InstantiationException

-					| IllegalAccessException | UnsupportedLookAndFeelException e1) {

-				// TODO Auto-generated catch block

-				e1.printStackTrace();

-			}

-

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

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

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

-		setBounds(left, top, 416, 300);

-		//setBounds(100, 100, 288, 300);

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

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

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

-		contentPanel.setLayout(null);

-		{

-			JLabel lblNewLabel = new JLabel("Software hinzuf\u00FCgen");

-			lblNewLabel.setFont(new Font("Dialog", Font.PLAIN, 14));

-			lblNewLabel.setBounds(10, 11, 194, 25);

-			contentPanel.add(lblNewLabel);

-		}

-		{

-			JLabel lblHersteller = new JLabel("Hersteller: *");

-			lblHersteller.setBounds(10, 47, 100, 20);

-			contentPanel.add(lblHersteller);

-		}

-		{

-			textField = new JTextField();

-			textField.setBounds(120, 47, 270, 20);

-			contentPanel.add(textField);

-			textField.setColumns(10);

-		}

-		{

-			JLabel lblNewLabel_1 = new JLabel("Name: *");

-			lblNewLabel_1.setBounds(10, 78, 100, 20);

-			contentPanel.add(lblNewLabel_1);

-		}

-		{

-			textField_1 = new JTextField();

-			textField_1.setColumns(10);

-			textField_1.setBounds(120, 78, 270, 20);

-			contentPanel.add(textField_1);

-		}

-		{

-			JLabel lblVersion = new JLabel("Version: *");

-			lblVersion.setBounds(10, 109, 100, 20);

-			contentPanel.add(lblVersion);

-		}

-		{

-			textField_2 = new JTextField();

-			textField_2.setColumns(10);

-			textField_2.setBounds(120, 109, 270, 20);

-			contentPanel.add(textField_2);

-		}

-		{

-			JLabel lblArchitektur = new JLabel("Architektur: *");

-			lblArchitektur.setBounds(10, 140, 100, 20);

-			contentPanel.add(lblArchitektur);

-		}

-		

-		comboBox = new JComboBox();

-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"32-bit", "64-bit"}));

-		comboBox.setBounds(120, 140, 135, 20);

-		contentPanel.add(comboBox);

-		

-		JLabel lblLizenzpflichtig = new JLabel("Lizenzpflichtig: *");

-		lblLizenzpflichtig.setBounds(10, 171, 100, 20);

-		contentPanel.add(lblLizenzpflichtig);

-		

-		checkBox = new JCheckBox("");

-		checkBox.setBounds(120, 167, 97, 23);

-		contentPanel.add(checkBox);

-		{

-			JPanel buttonPane = new JPanel();

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

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

-			{

-				JButton okButton = new JButton("OK");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(textField.getText().isEmpty()==false&&textField_2.getText().isEmpty()==false&&comboBox.getSelectedIndex()!=-1&&textField_1.getText().isEmpty()==false)

-						{

-						int Kosten=0;

-						if(checkBox.isSelected()==true)

-						{

-							Kosten=1;

-						}

-						Connection con=sql.getConnection();

-

-						sql.AddSoftware(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString());

-

-						dispose();

-						}else

-						{

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

-									"Error", JOptionPane.ERROR_MESSAGE);	

-						}

-					}

-					

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

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

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-	}

-}

diff --git a/Dozentenmodul/src/GUI/BillOfRights_GUI.java b/Dozentenmodul/src/GUI/BillOfRights_GUI.java
index c3ff7be0..6f66d479 100644
--- a/Dozentenmodul/src/GUI/BillOfRights_GUI.java
+++ b/Dozentenmodul/src/GUI/BillOfRights_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
diff --git a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
index 7e97f008..784c66a7 100644
--- a/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageAllgemein_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -24,12 +24,14 @@ 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 models.Image;
+import models.person;
+
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
diff --git a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
index bf1c8a86..a3fdcf20 100644
--- a/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EditImageTechnisch_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 
 import java.awt.Dimension;
@@ -22,7 +22,6 @@ 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;
@@ -34,6 +33,8 @@ import javax.swing.ButtonGroup;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
 
+import models.Image;
+
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
 
diff --git a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
index a9889d9f..4eb5c609 100644
--- a/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeImageAllgemein_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 
 import java.awt.Dimension;
@@ -25,12 +25,14 @@ 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 models.Image;
+import models.person;
+
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
index 3fd6fcbb..daf46d99 100644
--- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
@@ -1,4 +1,4 @@
-package GUI;

+package gui;

 

 

 import java.awt.Dimension;

@@ -22,7 +22,6 @@ 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;

@@ -34,6 +33,8 @@ import javax.swing.ButtonGroup;
 import javax.swing.JSpinner;

 import javax.swing.SpinnerNumberModel;

 

+import models.Image;

+

 @SuppressWarnings("serial")

 public class EingabeImageTechnisch_GUI extends JFrame {

 

@@ -263,11 +264,11 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 						

 						if(rdbtnlicenseJa.isSelected()==true)

 						{

-							Image.image.setLicenseneed(true);

+							Image.image.setLicensed(true);

 						}

 						else

 						{

-							Image.image.setLicenseneed(false);

+							Image.image.setLicensed(false);

 						}

 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

@@ -296,11 +297,11 @@ public class EingabeImageTechnisch_GUI extends JFrame {
 						

 						if(rdbtnlicenseJa.isSelected()==true)

 						{

-							Image.image.setLicenseneed(true);

+							Image.image.setLicensed(true);

 						}

 						else

 						{

-							Image.image.setLicenseneed(false);

+							Image.image.setLicensed(false);

 						}

 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
deleted file mode 100644
index 50d8e5f9..00000000
--- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
+++ /dev/null
@@ -1,311 +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.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 sql.sql;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.sql.Connection;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import java.util.Arrays;

-import javax.swing.JSeparator;

-import java.awt.List;

-import java.awt.event.KeyAdapter;

-import java.awt.event.KeyEvent;

-import javax.swing.plaf.basic.BasicArrowButton;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import Models.vm;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-

-@SuppressWarnings("serial")

-public class EingabeSoftwareDaten extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	sql sql=new sql();

-	private JTextField textField;

-	List listavailable;

-	List listchoosed;

-	

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			EingabeSoftwareDaten dialog = new EingabeSoftwareDaten();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	@SuppressWarnings({ })

-	public EingabeSoftwareDaten() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		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, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 577, 71);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Eingabe der installierten Software (Schritt 5 von 7)");

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

-				panel.add(lblNewLabel);

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

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte geben Sie nun die in Ihrem System installierte Software an.");

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

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 95, 567, 512);

-		contentPanel.setBackground(SystemColor.menu);

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

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JLabel lblSysteminformationen = new JLabel("Verf\u00FCgbare Software");

-		lblSysteminformationen.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblSysteminformationen.setBounds(10, 11, 162, 20);

-		contentPanel.add(lblSysteminformationen);

-		

-		

-		JLabel lblAusgewhlteSoftware = new JLabel("Installierte Software");

-		lblAusgewhlteSoftware.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblAusgewhlteSoftware.setBounds(306, 11, 162, 20);

-		contentPanel.add(lblAusgewhlteSoftware);

-		

-

-		

-		textField = new JTextField();

-		textField.addKeyListener(new KeyAdapter() {

-			@Override

-			public void keyReleased(KeyEvent e) {

-				

-				

-				Connection con=sql.getConnection();

-				ResultSet rs=sql.getSoftwareByName(con, textField.getText().toString());

-				listavailable.removeAll();

-				try {

-					while(rs.next())

-					{

-						listavailable.add(rs.getString("SW"));

-					}

-				} catch (SQLException e1) {

-					// TODO Auto-generated catch block

-					e1.printStackTrace();

-				}

-					

-			}

-		});

-

-		textField.setBounds(10, 36, 244, 20);

-		contentPanel.add(textField);

-		textField.setColumns(10);

-		

-		JButton btnSoftwareHinzufgen = new JButton("Software hinzuf\u00FCgen");

-		btnSoftwareHinzufgen.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				AddSoftware as=new AddSoftware();

-				as.setVisible(true);

-			}

-		});

-		btnSoftwareHinzufgen.setBounds(10, 483, 162, 23);

-		contentPanel.add(btnSoftwareHinzufgen);

-		

-		listavailable = new List();

-		Connection con=sql.getConnection();

-		ResultSet he=sql.getAllHersteller(con);

-		

-		try {

-			while(he.next())

-			{

-				

-				ResultSet sw=sql.getAllSoftware(con, he.getString("Name"));

-				

-				while(sw.next())

-				{

-					

-					listavailable.add(he.getString("Name")+" "+sw.getString("Produktname")+" "+sw.getString("Version")+" "+sw.getString("Architektur"));

-				}

-			}

-		} catch (SQLException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		}

-		listavailable.setMultipleMode(true);

-		listavailable.setBounds(10, 62, 244, 415);

-		contentPanel.add(listavailable);

-		

-		listchoosed = new List();

-		if(vm.vl.getSoftware()!=null)

-		{

-			for(int i=0;i<vm.vl.getSoftware().getItemCount();i++){

-				listchoosed.add(vm.vl.getSoftware().getItem(i));

-				listavailable.remove(vm.vl.getSoftware().getItem(i));

-			}

-		}

-

-		listchoosed.setMultipleMode(true);

-		listchoosed.setBounds(306, 62, 244, 415);

-		contentPanel.add(listchoosed);

-		

-		JButton btnNewButton = new BasicArrowButton(BasicArrowButton.EAST);

-		btnNewButton.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				String[] items=new String[listavailable.getItemCount()];

-				items=listavailable.getSelectedItems();

-				for(int i=0;i<items.length;i++)

-				{

-					listchoosed.add(items[i]);

-					

-					listavailable.remove(items[i]);

-				}

-				

-				String[] sort=listchoosed.getItems();

-				Arrays.sort(sort);

-				listchoosed.removeAll();

-				

-				for(int i=0;i<sort.length;i++)

-				{

-					listchoosed.add(sort[i]);

-				}

-				

-				

-			}

-		});

-		btnNewButton.setBounds(260, 223, 40, 40);

-		contentPanel.add(btnNewButton);

-		

-		JButton btnNewButton_1 = new BasicArrowButton(BasicArrowButton.WEST);

-		btnNewButton_1.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				String[] items=new String[listchoosed.getItemCount()];

-				items=listchoosed.getSelectedItems();

-				for(int i=0;i<items.length;i++)

-				{

-					listavailable.add(items[i]);

-					listchoosed.remove(items[i]);

-				}

-				String[] sort=listavailable.getItems();

-				Arrays.sort(sort);

-				listavailable.removeAll();

-				

-				for(int i=0;i<sort.length;i++)

-				{

-					listavailable.add(sort[i]);

-				}

-			}

-		});

-		btnNewButton_1.setBounds(260, 274, 40, 40);

-		contentPanel.add(btnNewButton_1);

-		

-

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 631, 587, 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) {

-						vm.vl.setSoftware(listchoosed);

-						EingabeSystemDaten eas=new EingabeSystemDaten();

-						eas.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 arg0) {

-						vm.vl.setSoftware(listchoosed);

-						Freigabe fs=new Freigabe();

-						fs.setVisible(true);

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 618, 616, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 82, 587, 2);

-		getContentPane().add(separator_1);		

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

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

-		menuBar.add(mnSuchen);

-		

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

-		mnSuchen.add(mntmVlSuche);

-		

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

-		menuBar.add(mnHilfe);

-		

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

-		mnHilfe.add(mntmFaq);

-		

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

-		mnHilfe.add(mntmOtrs);

-

-	}

-}

diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
deleted file mode 100644
index 2722fa51..00000000
--- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java
+++ /dev/null
@@ -1,311 +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 sql.sql;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import javax.swing.JTextArea;

-import java.awt.Choice;

-import java.sql.Connection;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import Models.vm;

-import com.toedter.calendar.JDateChooser;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import javax.swing.JScrollPane;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-

-@SuppressWarnings("serial")

-public class EingabeSystemDaten extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	sql sql=new sql();

-	private JTextField Laborname;

-	JDateChooser dateChooser;

-	JDateChooser dateChooser_1;

-	Choice choiceOS;

-	JTextArea shortDesc;

-	JTextArea longDesc;

-	JTextArea comment;

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			EingabeSystemDaten dialog = new EingabeSystemDaten();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public EingabeSystemDaten() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		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, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 587, 71);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Eingabe der systembezogenen Daten (Schritt 4 von 7)");

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

-				panel.add(lblNewLabel);

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

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte geben Sie nun die notwendigen Daten Ihres Systems ein.");

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

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 95, 567, 506);

-		contentPanel.setBackground(Color.WHITE);

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

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JLabel lblSysteminformationen = new JLabel("Systeminformationen");

-		lblSysteminformationen.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblSysteminformationen.setBounds(10, 11, 162, 14);

-		contentPanel.add(lblSysteminformationen);

-		

-		JLabel lblLabornameanzeigename = new JLabel("Laborname (Anzeigename): *");

-		lblLabornameanzeigename.setBounds(10, 36, 150, 20);

-		contentPanel.add(lblLabornameanzeigename);

-		

-		Laborname = new JTextField();

-		Laborname.setText(vm.vl.getLaborname());

-		Laborname.setBounds(170, 36, 350, 20);

-		contentPanel.add(Laborname);

-		Laborname.setColumns(10);

-		

-		JLabel lblKurzbeschreibung = new JLabel("Kurzbeschreibung: *");

-		lblKurzbeschreibung.setBounds(10, 67, 150, 20);

-		contentPanel.add(lblKurzbeschreibung);

-		

-		JLabel lblLangbeschreibung = new JLabel("Langbeschreibung: *");

-		lblLangbeschreibung.setBounds(10, 139, 150, 20);

-		contentPanel.add(lblLangbeschreibung);

-		

-		JLabel lblKommentar = new JLabel("Kommentar:");

-		lblKommentar.setBounds(10, 308, 150, 20);

-		contentPanel.add(lblKommentar);

-		

-		JLabel lblBetriebssystem = new JLabel("Betriebssystem: *");

-		lblBetriebssystem.setBounds(10, 373, 150, 20);

-		contentPanel.add(lblBetriebssystem);

-		

-		choiceOS = new Choice();

-		choiceOS.setFont(new Font("Tahoma", Font.PLAIN, 11));

-

-

-

-

-		

-		choiceOS.setBounds(170, 373, 226, 20);

-		

-		Connection con=sql.getConnection();

-		ResultSet rs=sql.getAllOS(con);

-		

-		try {

-			while(rs.next())

-			{

-				choiceOS.addItem(rs.getString("Produktname")+" "+rs.getString("Version")+" "+rs.getString("Architektur"));

-			}

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}	

-		choiceOS.select(vm.vl.getOS());

-		

-		contentPanel.add(choiceOS);

-		

-		JLabel lblGltigkeitsdatumVon = new JLabel("G\u00FCltigkeitsdatum: *");

-		lblGltigkeitsdatumVon.setBounds(10, 404, 150, 20);

-		contentPanel.add(lblGltigkeitsdatumVon);

-		

-		JLabel lblVon = new JLabel("von");

-		lblVon.setBounds(170, 407, 24, 14);

-		contentPanel.add(lblVon);

-		

-		dateChooser = new JDateChooser();

-		dateChooser.setDateFormatString("dd.MM.yyyy HH:mm:ss");

-		dateChooser.setDate(vm.vl.getBegin());

-		dateChooser.setBounds(204, 404, 132, 20);

-		contentPanel.add(dateChooser);

-		

-		JLabel lblNewLabel_1 = new JLabel("bis");

-		lblNewLabel_1.setBounds(354, 407, 24, 14);

-		contentPanel.add(lblNewLabel_1);

-		

-		dateChooser_1 = new JDateChooser();

-		dateChooser_1.setDateFormatString("dd.MM.yyyy HH:mm:ss");

-		dateChooser_1.setDate(vm.vl.getEnd());

-		dateChooser_1.setBounds(388, 404, 132, 20);

-		contentPanel.add(dateChooser_1);

-		

-		JButton btnHinzufgen = new JButton("Hinzuf\u00FCgen");

-		btnHinzufgen.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				AddOS os=new AddOS();

-				os.setVisible(true);

-				

-			}

-		});

-		btnHinzufgen.setBounds(402, 372, 118, 23);

-		contentPanel.add(btnHinzufgen);

-		shortDesc=new JTextArea();

-		shortDesc.setBorder(UIManager.getBorder("ComboBox.border"));

-		shortDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		shortDesc.setText(vm.vl.getShortDesc());

-		JScrollPane scrollPane = new JScrollPane(shortDesc);

-		scrollPane.setBorder(null);

-		scrollPane.setBounds(170, 67, 350, 63);

-		contentPanel.add(scrollPane);

-		longDesc=new JTextArea();

-		longDesc.setBorder(UIManager.getBorder("TextField.border"));

-		longDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		longDesc.setText(vm.vl.getLongDesc());

-		JScrollPane scrollPane_1 = new JScrollPane(longDesc);

-		scrollPane_1.setBorder(null);

-		scrollPane_1.setBounds(170, 139, 350, 158);

-		contentPanel.add(scrollPane_1);

-		JScrollPane scrollPane_2 = new JScrollPane();

-		scrollPane_2.setBorder(UIManager.getBorder("TextArea.border"));

-		scrollPane_2.setBounds(170, 308, 350, 59);

-		contentPanel.add(scrollPane_2);

-		

-		comment = new JTextArea();

-		comment.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		comment.setBorder(UIManager.getBorder("TextField.border"));

-		scrollPane_2.setViewportView(comment);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 630, 587, 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 arg0) {

-						vm.vl.setBegin(dateChooser.getDate());

-						vm.vl.setComment(comment.getText());

-						vm.vl.setEnd(dateChooser_1.getDate());

-						vm.vl.setLaborname(Laborname.getText());

-						vm.vl.setLongDesc(longDesc.getText());

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

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

-						EingabeImageAllgemein_GUI ea= new EingabeImageAllgemein_GUI();

-						ea.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 arg0) {

-						vm.vl.setBegin(dateChooser.getDate());

-						vm.vl.setComment(comment.getText());

-						vm.vl.setEnd(dateChooser_1.getDate());

-						vm.vl.setLaborname(Laborname.getText());

-						vm.vl.setLongDesc(longDesc.getText());

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

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

-						if(Laborname.getText().isEmpty()==false&&shortDesc.getText().isEmpty()==false&&longDesc.getText().isEmpty()==false&&dateChooser.getDate()!=null&&dateChooser_1.getDate()!=null)

-						{

-						EingabeSoftwareDaten ea=new EingabeSoftwareDaten();

-						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, 617, 587, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 82, 587, 2);

-		getContentPane().add(separator_1);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

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

-		menuBar.add(mnSuchen);

-		

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

-		mnSuchen.add(mntmVlSuche);

-		

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

-		menuBar.add(mnHilfe);

-		

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

-		mnHilfe.add(mntmFaq);

-		

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

-		mnHilfe.add(mntmOtrs);

-		

-	}

-}

diff --git a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
index 32cdd288..045f8a84 100644
--- a/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeVeranstaltungAllgemein_GUI.java
@@ -1,39 +1,40 @@
-package GUI;
+package gui;
 
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
 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.Lecture;
-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 models.Lecture;
+import models.person;
+
 
 @SuppressWarnings("serial")
 public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
@@ -81,8 +82,8 @@ public class EingabeVeranstaltungAllgemein_GUI extends JFrame {
 		}
 		setTitle("bwLehrpool Suite *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
 		//setBounds(100, 100, 603, 722);
 		getContentPane().setLayout(null);
diff --git a/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java
index a8e581a5..3733b200 100644
--- a/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java
@@ -1,42 +1,41 @@
-package GUI;
+package gui;
 
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.ScrollPane;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
 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.JFrame;
 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.JMenuBar;
 import javax.swing.JMenuItem;
-import Models.Image;
-import Models.Lecture;
-
-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.JPanel;
 import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import java.awt.ScrollPane;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+
+import models.Lecture;
+
+
 import com.toedter.calendar.JDateChooser;
 
 @SuppressWarnings("serial")
@@ -44,8 +43,6 @@ public class EingabeVeranstatlungTechnisch_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
 	private JTextField textFieldLaborname;
 	JRadioButton rdbtnJa;
 	JDateChooser dateChooserend;
@@ -87,8 +84,8 @@ public class EingabeVeranstatlungTechnisch_GUI extends JFrame {
 		}
 		setTitle("bwLehrpool Suite *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
 		setBounds(left, top, 603, 722);
 		//setBounds(100, 100, 603, 722);
 		getContentPane().setLayout(null);
diff --git a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
index 4ba0aa0d..20041516 100644
--- a/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
+++ b/Dozentenmodul/src/GUI/ExtendedSearch_GUI.java
@@ -1,41 +1,33 @@
-package GUI;
+package gui;
 
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
 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 {
@@ -170,7 +162,7 @@ public class ExtendedSearch_GUI extends JFrame {
 		lblHochschuleuniversitt.setBounds(10, 70, 176, 20);
 		panel_2.add(lblHochschuleuniversitt);
 		
-		JComboBox comboBox = new JComboBox();
+		JComboBox<String> comboBox = new JComboBox<String>();
 		comboBox.setBounds(196, 70, 351, 20);
 		panel_2.add(comboBox);
 		{
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index 60e509e2..94e1e05d 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -6,7 +6,6 @@ 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;
@@ -19,11 +18,8 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 
-import Models.User;
+import ftp.DownloadTask;
 
-import rmi.RmiClientMethods;
-import server.ServerInterface;
-import downloader.DownloadTask;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
@@ -35,6 +31,12 @@ import java.awt.Font;
 import javax.swing.JTextPane;
 import javax.swing.JSeparator;
 
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import server.User;
+import thrift.ThriftConnection;
+
 @SuppressWarnings("serial")
 public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener {
 
@@ -61,8 +63,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	long bytesread;
 	JLabel labelZeit; 
 	boolean taskrun=false;
-    RmiClientMethods rmi=new RmiClientMethods();
-    ServerInterface sint=rmi.getInterface();
+	ThriftConnection thrift=new ThriftConnection();
+	Client client=thrift.getThriftConnection();
 	/**
 	 * Launch the application.
 	 */
@@ -89,8 +91,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 				if(taskrun==true)
 				{
 					try {
-						sint.DeleteFtpUser(user.getUsername());
-					} catch (RemoteException e1) {
+						client.DeleteFtpUser(user.userName);
+					} catch (TException e1) {
 						// TODO Auto-generated catch block
 						e1.printStackTrace();
 					}
@@ -116,10 +118,9 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		setBackground(Color.WHITE);
 		setTitle("Dozentenmodul *Prototyp*");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 603) / 2;
-		int left=(screenSize.width - 722) / 2;
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 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));
@@ -265,8 +266,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 						{
 						task.cancel(true);
 						try {
-							sint.DeleteFtpUser(user.getUsername());
-						} catch (RemoteException e1) {
+							client.DeleteFtpUser(user.userName);
+						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
 						}
@@ -291,16 +292,14 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
         progressBar.setValue(0);
 
         try {
-        	user=sint.getFtpUser();
-			downloadPath=sint.getPathOfImage(filename);
-		} catch (RemoteException e) {
+        	user=client.getFtpUser();
+			//downloadPath=client.getPathOfImage(filename);
+		} catch (TException 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 = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this);
         task.addPropertyChangeListener(this);
         task.execute();
         taskrun=true;
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index d4d1d414..1a76b7b3 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -1,43 +1,44 @@
-package GUI;

+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.Font;

+import java.awt.SystemColor;

 import java.awt.Toolkit;

+import java.awt.event.ActionEvent;

+import java.awt.event.ActionListener;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import java.beans.PropertyChangeEvent;

+import java.beans.PropertyChangeListener;

 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.JMenu;

+import javax.swing.JMenuBar;

 import javax.swing.JPanel;

 import javax.swing.JProgressBar;

+import javax.swing.JSeparator;

+import javax.swing.JTextPane;

 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.Image;

-import Models.User;

-import Models.person;

+import models.Image;

+import models.person;

 

-import java.awt.SystemColor;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JSeparator;

+import org.apache.thrift.TException;

+

+import server.Server.Client;

+import thrift.ThriftConnection;

+import ftp.UploadTask;

 

 

 @SuppressWarnings("serial")

@@ -50,7 +51,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	JProgressBar progressBar;

 	String host="141.79.128.121";

 	int port=21;

-	User user;

+	server.User user;

 	String filename="";

 	File uploadFile;

 	static String arg="";

@@ -64,8 +65,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	double speed;

 	long bytesread;

 	boolean taskrun=false;

-    RmiClientMethods rmi=new RmiClientMethods();

-    ServerInterface sint=rmi.getInterface();

+	ThriftConnection thrift=new ThriftConnection();

+	Client client=thrift.getThriftConnection();

 	/**

 	 * Launch the application.

 	 */

@@ -92,8 +93,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 				if(taskrun==true)

 				{

 					try {

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

-					} catch (RemoteException e1) {

+						

+						client.DeleteFtpUser(user.userName);

+					} catch (TException e1) {

 						// TODO Auto-generated catch block

 						e1.printStackTrace();

 					}

@@ -273,9 +275,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 						if(taskrun==true)

 						{

 						try {

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

+							client.DeleteFtpUser(user.userName);

 							

-						} catch (RemoteException e1) {

+						} catch (TException  e1) {

 							// TODO Auto-generated catch block

 							e1.printStackTrace();

 						}

@@ -324,13 +326,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
         progressBar.setValue(0);

 

         try {

-			user=sint.getFtpUser();

-		} catch (RemoteException e) {

+			user=client.getFtpUser();

+			System.out.println("name"+user.userName);

+			System.out.println("path"+user.path);

+			System.out.println("pass"+user.password);

+		} catch (TException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

 

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

+        task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile);

+      

         task.addPropertyChangeListener(this);

         task.execute();

         taskrun=true;

@@ -382,8 +388,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
     public boolean writeData(){

     	

     	try {

-			sint.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicenseneed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

-		} catch (RemoteException e) {

+			client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

+		} catch (TException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 			return false;

diff --git a/Dozentenmodul/src/GUI/Freigabe.java b/Dozentenmodul/src/GUI/Freigabe.java
deleted file mode 100644
index d720e9b4..00000000
--- a/Dozentenmodul/src/GUI/Freigabe.java
+++ /dev/null
@@ -1,226 +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.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 sql.sql;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import java.awt.List;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.JRadioButton;

-import javax.swing.ButtonGroup;

-import java.awt.event.ItemListener;

-import java.awt.event.ItemEvent;

-

-

-@SuppressWarnings("serial")

-public class Freigabe extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	sql sql=new sql();

-	private final ButtonGroup buttonGroup = new ButtonGroup();

-	JRadioButton rdbtnSelektierteHochschulen;

-	List list;

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			Freigabe dialog = new Freigabe();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	@SuppressWarnings({ })

-	public Freigabe() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		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, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 577, 71);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Freigabe (Schritt 6 von 7)");

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

-				panel.add(lblNewLabel);

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

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte spezifizieren Sie, f\u00FCr welche Personen/Hochschulen Ihre VL verf\u00FCgbar sein soll.");

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

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 95, 567, 512);

-		contentPanel.setBackground(Color.WHITE);

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

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JLabel lblFreigeben = new JLabel("Freigeben:");

-		lblFreigeben.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblFreigeben.setBounds(10, 11, 93, 22);

-		contentPanel.add(lblFreigeben);

-		

-		JRadioButton rdbtnPrivat = new JRadioButton("Privat");

-		rdbtnPrivat.setSelected(true);

-		rdbtnPrivat.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnPrivat);

-		rdbtnPrivat.setBounds(10, 40, 153, 23);

-		contentPanel.add(rdbtnPrivat);

-		

-		JRadioButton rdbtnFrAlleHochschulen = new JRadioButton("F\u00FCr alle Hochschulen");

-		rdbtnFrAlleHochschulen.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnFrAlleHochschulen);

-		rdbtnFrAlleHochschulen.setBounds(10, 92, 153, 23);

-		contentPanel.add(rdbtnFrAlleHochschulen);

-		

-		JRadioButton rdbtnEigeneHochschule = new JRadioButton("Eigene Hochschule");

-		rdbtnEigeneHochschule.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnEigeneHochschule);

-		rdbtnEigeneHochschule.setBounds(10, 66, 153, 23);

-		contentPanel.add(rdbtnEigeneHochschule);

-		

-		rdbtnSelektierteHochschulen = new JRadioButton("Hochschulen ausw\u00E4hlen");

-		rdbtnSelektierteHochschulen.addItemListener(new ItemListener() {

-			public void itemStateChanged(ItemEvent e) {

-				if(rdbtnSelektierteHochschulen.isSelected()==true)

-				{

-					list.setBackground(Color.WHITE);

-					list.setEnabled(true);

-				}

-				else

-				{

-					list.setEnabled(false);

-					list.setBackground(SystemColor.control);

-					

-				}

-			}

-		});

-

-		rdbtnSelektierteHochschulen.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnSelektierteHochschulen);

-		rdbtnSelektierteHochschulen.setBounds(10, 118, 153, 23);

-		contentPanel.add(rdbtnSelektierteHochschulen);

-		

-		list = new List();

-		list.setMultipleMode(true);

-		list.setBackground(SystemColor.control);

-		list.setEnabled(false);

-		list.setBounds(10, 147, 547, 355);

-		list.add("Hochschule Offenburg");

-		list.add("Hochschule Reutlingen");

-		list.add("Uni Freiburg");

-		list.add("Hochschule Karlsruhe");

-		contentPanel.add(list);

-	

-

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 631, 587, 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) {

-						

-						EingabeSoftwareDaten eas=new EingabeSoftwareDaten();

-						eas.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 arg0) {

-						

-						Summary fs=new Summary();

-						fs.setVisible(true);

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 618, 616, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 82, 587, 2);

-		getContentPane().add(separator_1);		

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

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

-		menuBar.add(mnSuchen);

-		

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

-		mnSuchen.add(mntmVlSuche);

-		

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

-		menuBar.add(mnHilfe);

-		

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

-		mnHilfe.add(mntmFaq);

-		

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

-		mnHilfe.add(mntmOtrs);

-

-	}

-}

diff --git a/Dozentenmodul/src/GUI/LinkImage_GUI.java b/Dozentenmodul/src/GUI/LinkImage_GUI.java
index ec93a629..38b3d5e3 100644
--- a/Dozentenmodul/src/GUI/LinkImage_GUI.java
+++ b/Dozentenmodul/src/GUI/LinkImage_GUI.java
@@ -1,69 +1,55 @@
-package GUI;
+package gui;
 
 
-import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.swing.JButton;
+import javax.swing.JComboBox;
 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.JFrame;
 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.JMenuBar;
 import javax.swing.JMenuItem;
-import Models.Image;
-import Models.Lecture;
-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.JPanel;
 import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.JTextField;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
-import java.awt.Panel;
 import javax.swing.JTable;
-import javax.swing.plaf.basic.BasicTabbedPaneUI.TabbedPaneLayout;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.JScrollPane;
 
-import rmi.RmiClientMethods;
-import server.ServerInterface;
+import models.Lecture;
+import models.person;
 
-import java.awt.ScrollPane;
-import java.rmi.RemoteException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.apache.thrift.TException;
 
-import javax.swing.JComboBox;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
+import server.Server.Client;
+import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
 public class LinkImage_GUI extends JFrame {
@@ -72,14 +58,13 @@ public class LinkImage_GUI extends JFrame {
 	String[] result;
 	JRadioButton rdbtnInternetJa;
 	JRadioButton rdbtnInternetNein;
-	JComboBox comboBox;
+	JComboBox<String> comboBox;
 	JTable tableAllImages;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
 	private JTextField textFieldName;
 	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
-    RmiClientMethods rmi=new RmiClientMethods();
-    ServerInterface sint=rmi.getInterface();
+	ThriftConnection thrift=new ThriftConnection();
+	Client client=thrift.getThriftConnection();
+
     
 	/**
 	 * Launch the application.
@@ -118,7 +103,6 @@ public class LinkImage_GUI extends JFrame {
 		int top=(screenSize.height - 603) / 2;
 		int left=(screenSize.width - 722) / 2;
 		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
 		
 
 		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
@@ -210,15 +194,15 @@ public class LinkImage_GUI extends JFrame {
 		lblErweiterteSuche.setBounds(431, 106, 89, 14);
 		panel_1.add(lblErweiterteSuche);
 		
-		comboBox = new JComboBox();
+		comboBox = new JComboBox<String>();
 		try {
-			List<String> list=sint.getAllOS();
+			List<String> list=client.getAllOS();
 			comboBox.addItem("");
 			for(int i=0;i<list.size();i++)
 			{
 			comboBox.addItem(list.get(i));
 			}
-		} catch (RemoteException e2) {
+		} catch (TException e2) {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
 		}
@@ -345,14 +329,7 @@ public class LinkImage_GUI extends JFrame {
 		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
 		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
 		
-		initTableModel(modelAll);
-
-
-
-		
-
-
-		
+		initTableModel(modelAll);		
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
@@ -363,9 +340,7 @@ public class LinkImage_GUI extends JFrame {
 				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();
@@ -381,14 +356,11 @@ public class LinkImage_GUI extends JFrame {
 					public void actionPerformed(ActionEvent e) {
 						
 						String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString();
-						String Name=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString();
-						String Nachname=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString().substring(0,Name.indexOf(" ") );
-						String Vorname=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString().substring(Name.indexOf(" ")+1,Name.length());
-
 						try {
-							
-							sint.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), Lecture.lecture.getStartdate(), Lecture.lecture.getEnddate(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät());
-						} catch (RemoteException e1) {
+							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+							System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString());
+							client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät());
+						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
 						}
@@ -430,22 +402,26 @@ public class LinkImage_GUI extends JFrame {
 	}
 	
 	public DefaultTableModel initTableModel(DefaultTableModel model){
-		List<Object[]> images;
+		List<server.Image> images;
 		try {
-			images = sint.getImageList();
-			Iterator<Object[]> i=images.iterator();
+			images = client.getImageList();
+			Iterator<server.Image> i=images.iterator();
+			List<Object[]> ListObj = new ArrayList<Object[]>();
 			int x=0;
 			
 			while(i.hasNext())
 			{
-				i.next();
 				
-				model.addRow(images.get(x));
+				i.next();
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()};
+				ListObj.add(obj);
+				model.addRow(ListObj.get(x));
 				x++;
+				
 			}
 			
 			return model;
-		} catch (RemoteException e1) {
+		} catch (TException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
diff --git a/Dozentenmodul/src/GUI/Login_GUI.java b/Dozentenmodul/src/GUI/Login_GUI.java
index 2a890d56..c982fa7b 100644
--- a/Dozentenmodul/src/GUI/Login_GUI.java
+++ b/Dozentenmodul/src/GUI/Login_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 
 import java.awt.Dimension;
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index d60ccc72..0f80d372 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -1,4 +1,4 @@
-package GUI;

+package gui;

 

 import java.awt.Dimension;

 import java.awt.FlowLayout;

diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
index ecdbf65d..d9ee091f 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -1,68 +1,50 @@
-package GUI;

+package gui;

 

 

-import java.awt.BorderLayout;

+import java.awt.Color;

 import java.awt.Dimension;

 import java.awt.FlowLayout;

+import java.awt.Font;

+import java.awt.SystemColor;

 import java.awt.Toolkit;

-import javax.swing.JFrame;

+import java.awt.event.ActionEvent;

+import java.awt.event.ActionListener;

+import java.awt.event.KeyAdapter;

+import java.awt.event.KeyEvent;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

 import javax.swing.JButton;

+import javax.swing.JComboBox;

 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.JFrame;

 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.JMenuBar;

 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.JPanel;

 import javax.swing.JRadioButton;

-import javax.swing.ButtonGroup;

-import javax.swing.JSpinner;

-import javax.swing.SpinnerNumberModel;

-import javax.swing.JTextField;

+import javax.swing.JScrollPane;

+import javax.swing.JSeparator;

 import javax.swing.JTabbedPane;

-import java.awt.Panel;

 import javax.swing.JTable;

-import javax.swing.plaf.basic.BasicTabbedPaneUI.TabbedPaneLayout;

+import javax.swing.JTextField;

+import javax.swing.JTextPane;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

+import javax.swing.border.TitledBorder;

 import javax.swing.table.DefaultTableModel;

-import javax.swing.table.TableModel;

-import javax.swing.JScrollPane;

-

-import rmi.RmiClientMethods;

-import server.ServerInterface;

 

-import java.awt.ScrollPane;

-import java.rmi.RemoteException;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

+import org.apache.thrift.TException;

 

-import javax.swing.JComboBox;

-import java.awt.event.KeyAdapter;

-import java.awt.event.KeyEvent;

+import server.Server.Client;

+import thrift.ThriftConnection;

 

 @SuppressWarnings("serial")

 public class SearchImage_GUI extends JFrame {

@@ -71,14 +53,12 @@ public class SearchImage_GUI extends JFrame {
 	String[] result;

 	JRadioButton rdbtnInternetJa;

 	JRadioButton rdbtnInternetNein;

-	JComboBox comboBox;

+	JComboBox<String> comboBox;

 	JTable tableAllImages;

-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();

-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();

 	private JTextField textFieldName;

 	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};

-    RmiClientMethods rmi=new RmiClientMethods();

-    ServerInterface sint=rmi.getInterface();

+    ThriftConnection con=new ThriftConnection();

+    Client client=con.getThriftConnection();

     

 	/**

 	 * Launch the application.

@@ -117,7 +97,6 @@ public class SearchImage_GUI extends JFrame {
 		int top=(screenSize.height - 603) / 2;

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

 		setBounds(left, top, 603, 722);

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

 		

 

 		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );

@@ -184,12 +163,8 @@ public class SearchImage_GUI extends JFrame {
 					{

 						modelAll.removeRow(i);

 					}

-				}

-				

-				

-			}

-			

-			

+				}					

+			}					

 		});

 

 		textFieldName.setBounds(270, 30, 250, 20);

@@ -209,15 +184,15 @@ public class SearchImage_GUI extends JFrame {
 		lblErweiterteSuche.setBounds(431, 106, 89, 14);

 		panel_1.add(lblErweiterteSuche);

 		

-		comboBox = new JComboBox();

+		comboBox = new JComboBox<String>();

 		try {

-			List<String> list=sint.getAllOS();

+			List<String> list=client.getAllOS();

 			comboBox.addItem("");

 			for(int i=0;i<list.size();i++)

 			{

 			comboBox.addItem(list.get(i));

 			}

-		} catch (RemoteException e2) {

+		} catch (TException e2) {

 			// TODO Auto-generated catch block

 			e2.printStackTrace();

 		}

@@ -237,9 +212,7 @@ public class SearchImage_GUI extends JFrame {
 					{

 						modelAll.removeRow(i);

 					}

-				}

-				

-				

+				}							

 			}

 			}

 		});

@@ -299,9 +272,7 @@ public class SearchImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();

 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();

 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();

-		

-				

-		

+								

 				scrollPaneAllImages.setViewportView(tableAllImages);

 				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);

 

@@ -356,13 +327,6 @@ public class SearchImage_GUI extends JFrame {
 		});

 		btnDownload.setBounds(449, 508, 118, 23);

 		contentPanel.add(btnDownload);

-

-

-

-		

-

-

-		

 		{

 			JPanel buttonPane = new JPanel();

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

@@ -372,10 +336,7 @@ public class SearchImage_GUI extends JFrame {
 			{

 				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());

-						

+					public void actionPerformed(ActionEvent e) {			

 						MainMenue_GUI main=new MainMenue_GUI();

 						main.setVisible(true);

 						dispose();

@@ -389,30 +350,9 @@ public class SearchImage_GUI extends JFrame {
 				JButton cancelButton = new JButton("Weiter");

 				cancelButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent e) {

-						

-						String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString();

-						String Name=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString();

-						String Nachname=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString().substring(0,Name.indexOf(" ") );

-						String Vorname=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 5).toString().substring(Name.indexOf(" ")+1,Name.length());

-						try {

-							Map<String, String> map=sint.getPersonData(Vorname, Nachname);

-							person.verantowrtlicher.setEMail(map.get("mail"));

-							person.verantowrtlicher.setFakultät(map.get("fak"));

-							person.verantowrtlicher.setHochschule(map.get("Hochschule"));

-							person.verantowrtlicher.setName(map.get("Nachname"));

-							person.verantowrtlicher.setTel(map.get("tel"));

-							person.verantowrtlicher.setVorname(map.get("Vorname"));

-							Image.image.setImagename(imagename);

-							//System.out.println(map.get("tel").toString());

-						} catch (RemoteException e1) {

-							// TODO Auto-generated catch block

-							e1.printStackTrace();

-						}

-

 						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();

 						ea.setVisible(true);

-						dispose();

-						

+						dispose();						

 					}

 				});

 				cancelButton.setActionCommand("Cancel");

@@ -449,22 +389,26 @@ public class SearchImage_GUI extends JFrame {
 	}

 	

 	public DefaultTableModel initTableModel(DefaultTableModel model){

-		List<Object[]> images;

+		List<server.Image> images;

 		try {

-			images = sint.getImageList();

-			Iterator<Object[]> i=images.iterator();

+			images = client.getImageList();

+			Iterator<server.Image> i=images.iterator();

+			List<Object[]> ListObj = new ArrayList<Object[]>();

 			int x=0;

 			

 			while(i.hasNext())

 			{

-				i.next();

 				

-				model.addRow(images.get(x));

+				i.next();

+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()};

+				ListObj.add(obj);

+				model.addRow(ListObj.get(x));

 				x++;

+				

 			}

 			

 			return model;

-		} catch (RemoteException e1) {

+		} catch (TException e1) {

 			// TODO Auto-generated catch block

 			e1.printStackTrace();

 		}

diff --git a/Dozentenmodul/src/GUI/SearchMethod_GUI.java b/Dozentenmodul/src/GUI/SearchMethod_GUI.java
index b4aa5586..24a12959 100644
--- a/Dozentenmodul/src/GUI/SearchMethod_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchMethod_GUI.java
@@ -1,40 +1,36 @@
-package GUI;
+package gui;
 
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
 import java.awt.Toolkit;
-import javax.swing.JFrame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JOptionPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
 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 {
diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java
deleted file mode 100644
index 38c69ad1..00000000
--- a/Dozentenmodul/src/GUI/Summary.java
+++ /dev/null
@@ -1,442 +0,0 @@
-package GUI;

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.List;

-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 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.JMenuItem;

-import javax.swing.JMenu;

-import Models.*;

-import Models.vm;

-import javax.swing.JTextArea;

-import javax.swing.JScrollPane;

-import javax.swing.JTabbedPane;

-import java.awt.Panel;

-import java.text.SimpleDateFormat;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-

-@SuppressWarnings("serial")

-public class Summary extends JFrame {

-	String[] result;

-

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			Summary dialog = new Summary();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public Summary() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		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, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 577, 68);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Fertig stellen (Schritt 7 von 7)");

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

-				panel.add(lblNewLabel);

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

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte laden Sie nun ihre fertige VL mithilfe des Uploaders auf den Server.");

-			txtpnBitteWhlenSie.setBounds(10, 36, 391, 42);

-			panel.add(txtpnBitteWhlenSie);

-		}

-

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 627, 577, 36);

-			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) {

-						Freigabe ea=new Freigabe();

-						ea.setVisible(true);

-						dispose();

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

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

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						

-						System.exit(0);

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 587, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 614, 587, 2);

-		getContentPane().add(separator_1);

-		

-		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);

-		tabbedPane.setBounds(10, 111, 567, 458);

-

-		

-		getContentPane().add(tabbedPane);

-		

-		Panel panel = new Panel();

-		panel.setBackground(Color.WHITE);

-		tabbedPane.addTab("Allgemein", null, panel, null);

-		panel.setLayout(null);

-		

-		JLabel label = new JLabel("Ersteller");

-		label.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		label.setBounds(264, 11, 251, 14);

-		panel.add(label);

-		

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

-		label_1.setBounds(10, 36, 65, 14);

-		panel.add(label_1);

-		

-		JLabel label_2 = new JLabel("Vorname:");

-		label_2.setBounds(264, 36, 65, 14);

-		panel.add(label_2);

-		

-		JLabel label_3 = new JLabel("Nachname:");

-		label_3.setBounds(10, 61, 65, 14);

-		panel.add(label_3);

-		

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

-		label_4.setBounds(264, 61, 65, 14);

-		panel.add(label_4);

-		

-		JLabel label_5 = new JLabel("Hochschule:");

-		label_5.setBounds(10, 86, 65, 14);

-		panel.add(label_5);

-		

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

-		label_6.setBounds(264, 86, 65, 14);

-		panel.add(label_6);

-		

-		JLabel label_Vorname_V = new JLabel((String) null);

-		label_Vorname_V.setText(personData.verantowrtlicher.getVorname());

-		label_Vorname_V.setBounds(85, 36, 169, 14);

-		panel.add(label_Vorname_V);

-		

-		JLabel label_Vorname_E = new JLabel((String) null);

-		label_Vorname_E.setText(personData.ersteller.getVorname());

-		label_Vorname_E.setBounds(339, 36, 169, 14);

-		panel.add(label_Vorname_E);

-		

-		JLabel label_Nachname_E = new JLabel((String) null);

-		label_Nachname_E.setText(personData.ersteller.getName());

-		label_Nachname_E.setBounds(339, 61, 169, 14);

-		panel.add(label_Nachname_E);

-		

-		JLabel label_Nachname_V = new JLabel((String) null);

-		label_Nachname_V.setText(personData.verantowrtlicher.getName());

-		label_Nachname_V.setBounds(85, 61, 169, 14);

-		panel.add(label_Nachname_V);

-		

-		JLabel label_Hochschule_V = new JLabel((String) null);

-		label_Hochschule_V.setText(personData.verantowrtlicher.getHochschule());

-		label_Hochschule_V.setBounds(85, 86, 169, 14);

-		panel.add(label_Hochschule_V);

-		

-		JLabel label_Hochschule_E = new JLabel((String) null);

-		label_Hochschule_E.setText(personData.ersteller.getHochschule());

-		label_Hochschule_E.setBounds(339, 86, 169, 14);

-		panel.add(label_Hochschule_E);

-		

-		JLabel label_Mail_E = new JLabel((String) null);

-		label_Mail_E.setText(personData.ersteller.getEMail());

-		label_Mail_E.setBounds(339, 111, 169, 14);

-		panel.add(label_Mail_E);

-		

-		JLabel label_14 = new JLabel("E-Mail:");

-		label_14.setBounds(264, 111, 65, 14);

-		panel.add(label_14);

-		

-		JLabel label_Mail_V = new JLabel((String) null);

-		label_Mail_V.setText(personData.verantowrtlicher.getEMail());

-		label_Mail_V.setBounds(85, 111, 169, 14);

-		panel.add(label_Mail_V);

-		

-		JLabel label_16 = new JLabel("E-Mail:");

-		label_16.setBounds(10, 111, 65, 14);

-		panel.add(label_16);

-		

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

-		label_17.setBounds(10, 136, 65, 14);

-		panel.add(label_17);

-		

-		JLabel label_Tel_V = new JLabel((String) null);

-		label_Tel_V.setText(personData.verantowrtlicher.getTel());

-		label_Tel_V.setBounds(85, 136, 169, 14);

-		panel.add(label_Tel_V);

-		

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

-		label_19.setBounds(264, 136, 65, 14);

-		panel.add(label_19);

-		

-		JLabel label_Tel_E = new JLabel((String) null);

-		label_Tel_E.setText(personData.ersteller.getTel());

-		label_Tel_E.setBounds(339, 136, 169, 14);

-		panel.add(label_Tel_E);

-		

-		JLabel label_Fak_E = new JLabel((String) null);

-		label_Fak_E.setText(personData.ersteller.getFakultät());

-		label_Fak_E.setBounds(339, 161, 169, 14);

-		panel.add(label_Fak_E);

-		

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

-		label_22.setBounds(264, 161, 65, 14);

-		panel.add(label_22);

-		

-		JLabel label_Fak_V = new JLabel((String) null);

-		label_Fak_V.setText(personData.verantowrtlicher.getFakultät());

-		label_Fak_V.setBounds(85, 161, 169, 14);

-		panel.add(label_Fak_V);

-		

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

-		label_24.setBounds(10, 161, 65, 14);

-		panel.add(label_24);

-		

-		JLabel label_25 = new JLabel("Verantwortlicher");

-		label_25.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		label_25.setBounds(10, 11, 244, 14);

-		panel.add(label_25);

-		

-		JButton btnZurDateneingabe = new JButton("Daten \u00E4ndern");

-		btnZurDateneingabe.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				EingabeImageAllgemein_GUI ea=new EingabeImageAllgemein_GUI();

-				ea.setVisible(true);

-				setVisible(false);

-			}

-		});

-		btnZurDateneingabe.setBounds(10, 186, 132, 23);

-		panel.add(btnZurDateneingabe);

-		

-		Panel panel_1 = new Panel();

-		panel_1.setBackground(Color.WHITE);

-		tabbedPane.addTab("Systeminformationen", null, panel_1, null);

-		panel_1.setLayout(null);

-		

-		JLabel label_end = new JLabel((String) null);

-		SimpleDateFormat fmt = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-		String Date_End=fmt.format(vm.vl.getEnd());

-		label_end.setText(Date_End);

-		label_end.setBounds(318, 310, 197, 14);

-		panel_1.add(label_end);

-		

-		JLabel label_27 = new JLabel("bis");

-		label_27.setBounds(262, 310, 46, 14);

-		panel_1.add(label_27);

-		

-		JLabel label_begin = new JLabel((String) null);

-		String Date_Begin=fmt.format(vm.vl.getBegin());

-		label_begin.setText(Date_Begin);

-		label_begin.setBounds(120, 310, 134, 14);

-		panel_1.add(label_begin);

-		

-		JLabel label_29 = new JLabel("G\u00FCltig von");

-		label_29.setBounds(10, 310, 100, 14);

-		panel_1.add(label_29);

-		

-		JLabel label_30 = new JLabel("Betriebssystem:");

-		label_30.setBounds(10, 285, 100, 14);

-		panel_1.add(label_30);

-		

-		JLabel label_OS = new JLabel((String) null);

-		label_OS.setText(vm.vl.getOS());

-		label_OS.setBounds(120, 285, 395, 14);

-		panel_1.add(label_OS);

-		

-		JScrollPane scrollPane_3 = new JScrollPane();

-		scrollPane_3.setBounds(121, 201, 393, 72);

-		panel_1.add(scrollPane_3);

-		

-		JTextArea textArea_comment = new JTextArea();

-		textArea_comment.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		textArea_comment.setText(vm.vl.getComment());

-		scrollPane_3.setViewportView(textArea_comment);

-		textArea_comment.setEditable(false);

-		

-		JLabel label_32 = new JLabel("Kommentar:");

-		label_32.setBounds(10, 200, 100, 14);

-		panel_1.add(label_32);

-		

-		JScrollPane scrollPane_2 = new JScrollPane();

-		scrollPane_2.setBounds(121, 117, 393, 72);

-		panel_1.add(scrollPane_2);

-		

-		JTextArea textArea_long = new JTextArea();

-		textArea_long.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		textArea_long.setText(vm.vl.getLongDesc());

-		scrollPane_2.setViewportView(textArea_long);

-		textArea_long.setEditable(false);

-		

-		JLabel label_33 = new JLabel("Langbeschreibung:");

-		label_33.setBounds(10, 116, 100, 14);

-		panel_1.add(label_33);

-		

-		JScrollPane scrollPane_1 = new JScrollPane();

-		scrollPane_1.setBounds(121, 37, 393, 72);

-		panel_1.add(scrollPane_1);

-		

-		JTextArea textArea_short = new JTextArea();

-		textArea_short.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		textArea_short.setText(vm.vl.getShortDesc());

-		scrollPane_1.setViewportView(textArea_short);

-		textArea_short.setEditable(false);

-		

-		JLabel label_34 = new JLabel("Kurzbeschreibung:");

-		label_34.setBounds(10, 36, 100, 14);

-		panel_1.add(label_34);

-		

-		JLabel label_35 = new JLabel("Laborname:");

-		label_35.setBounds(10, 11, 100, 14);

-		panel_1.add(label_35);

-		

-		JLabel label_Laborname = new JLabel((String) null);

-		label_Laborname.setText(vm.vl.getLaborname());

-		label_Laborname.setBounds(120, 11, 395, 14);

-		panel_1.add(label_Laborname);

-		

-		JButton btnDatenndern = new JButton("Daten \u00E4ndern");

-		btnDatenndern.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				EingabeSystemDaten es=new EingabeSystemDaten();

-				es.setVisible(true);

-				setVisible(false);

-			}

-		});

-		btnDatenndern.setBounds(10, 335, 132, 23);

-		panel_1.add(btnDatenndern);

-		

-		Panel panel_2 = new Panel();

-		panel_2.setBackground(Color.WHITE);

-		tabbedPane.addTab("Software", null, panel_2, null);

-		panel_2.setLayout(null);

-		

-		JScrollPane scrollPane = new JScrollPane();

-		scrollPane.setBounds(11, 37, 541, 334);

-		panel_2.add(scrollPane);

-		

-		List list_sw = new List();

-		list_sw.setEnabled(false);

-		List temp=vm.vl.getSoftware();

-		for(int i=0;i<temp.getItemCount();i++)

-		{

-			list_sw.add(temp.getItem(i));

-		}

-		scrollPane.setViewportView(list_sw);

-		

-		JLabel lblInstallierteSoftware = new JLabel("Installierte Software");

-		lblInstallierteSoftware.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblInstallierteSoftware.setBounds(10, 11, 171, 14);

-		panel_2.add(lblInstallierteSoftware);

-		

-		JButton btnDatenndern_1 = new JButton("Daten \u00E4ndern");

-		btnDatenndern_1.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				EingabeSoftwareDaten es=new EingabeSoftwareDaten();

-				es.setVisible(true);

-				setVisible(false);

-			}

-		});

-		btnDatenndern_1.setBounds(11, 382, 132, 23);

-		panel_2.add(btnDatenndern_1);

-		

-		JLabel lblZusammenfassung = new JLabel("Zusammenfassung");

-		lblZusammenfassung.setFont(new Font("Tahoma", Font.PLAIN, 16));

-		lblZusammenfassung.setBounds(10, 86, 223, 20);

-		getContentPane().add(lblZusammenfassung);

-		

-		JButton btnUploadtoolStarten = new JButton("Uploadtool starten");

-		btnUploadtoolStarten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				FTPUploader_GUI up=new FTPUploader_GUI();

-				up.setVisible(true);

-			}

-		});

-		btnUploadtoolStarten.setBounds(439, 580, 138, 23);

-		getContentPane().add(btnUploadtoolStarten);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

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

-		menuBar.add(mnSuchen);

-		

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

-		mnSuchen.add(mntmVlSuche);

-		

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

-		menuBar.add(mnHilfe);

-		

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

-		mnHilfe.add(mntmFaq);

-		

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

-		mnHilfe.add(mntmOtrs);

-		

-		

-

-	}

-}

diff --git a/Dozentenmodul/src/GUI/VmWareLink_GUI.java b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
index 8cc28b39..b803ee44 100644
--- a/Dozentenmodul/src/GUI/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
@@ -1,4 +1,4 @@
-package GUI;
+package gui;
 
 import java.awt.Desktop;
 import java.awt.Dimension;
diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java
deleted file mode 100644
index 3c322901..00000000
--- a/Dozentenmodul/src/GUI/searchRohling.java
+++ /dev/null
@@ -1,236 +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.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.KeyAdapter;

-import java.awt.event.KeyEvent;

-import java.net.SocketException;

-import java.rmi.RemoteException;

-import java.security.NoSuchAlgorithmException;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import java.util.ArrayList;

-import java.awt.List;

-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 downloader.FTPException;

-import downloader.FTPUtility;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.JComboBox;

-import javax.swing.DefaultComboBoxModel;

-

-import rmi.RmiClientMethods;

-import server.ServerInterface;

-

-import Models.User;

-

-@SuppressWarnings("serial")

-public class searchRohling extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	private JTextField textFieldsearch;

-	List list;

-	ArrayList<String> result;

-	String host="141.79.128.121";

-	User user;

-	int port=21;

-    RmiClientMethods rmi=new RmiClientMethods();

-    ServerInterface sint=rmi.getInterface();

-	//FTPUtility f=new FTPUtility(host, port, user.getUsername(), user.getPass());

-	/**

-	 * Launch the application.

-	 */

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

-		try {

-			searchRohling dialog = new searchRohling();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	

-	public searchRohling() {

-		getContentPane().setEnabled(false);

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

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

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		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, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 577, 71);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Rohling ausw\u00E4hlen (Schritt 1 von 7)");

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

-				panel.add(lblNewLabel);

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

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte w\u00E4hlen Sie nun Ihr gew\u00FCnschtes Rohling aus und klicken Sie auf Download. Sollten Sie schon im Besitz Ihres gew\u00FCnschten Rohlings sein klicken Sie auf weiter.");

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

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 126, 567, 446);

-		contentPanel.setBackground(Color.WHITE);

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

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		list = new List();

-		list.setBounds(10, 10, 547, 426);

-		contentPanel.add(list);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 630, 587, 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 arg0) {

-						MainMenue_GUI ac=new MainMenue_GUI();

-						ac.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 arg0) {

-						VmWareLink_GUI vp=new VmWareLink_GUI();

-						vp.setVisible(true);

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		

-		JButton btnDownload = new JButton("Download");

-		btnDownload.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

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

-				ftp.setVisible(true);

-			}

-		});

-		btnDownload.setBounds(488, 583, 89, 23);

-		getContentPane().add(btnDownload);

-		

-		textFieldsearch = new JTextField();

-		textFieldsearch.addKeyListener(new KeyAdapter() {

-			@Override

-			public void keyReleased(KeyEvent arg0) {

-				System.out.println(textFieldsearch.getText().toString());}}

-				/*list.removeAll();

-				for(int i=0;i<result.length;i++)

-				{

-					if(result[i]!=null)

-						list.add(result[i]);

-					

-				}

-			}

-		}*/);

-		textFieldsearch.setBounds(91, 95, 166, 20);

-		getContentPane().add(textFieldsearch);

-		textFieldsearch.setColumns(10);

-		

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 617, 587, 2);

-		getContentPane().add(separator);

-		

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 82, 587, 2);

-		getContentPane().add(separator_1);

-		

-		JLabel lblName = new JLabel("Name:");

-		lblName.setBounds(10, 98, 71, 14);

-		getContentPane().add(lblName);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

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

-		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);

-		

-try {

-			result=sint.getImages();

-			

-			for(int i=0; i<result.size();i++)

-			{

-				System.out.println(result.get(i).toString());

-				list.add(result.get(i).toString());

-			}

-

-			//list.removeAll();

-

-		} catch (RemoteException e2) {

-			// TODO Auto-generated catch block

-			e2.printStackTrace();

-		}

-

-	

-	}

-}

diff --git a/Dozentenmodul/src/Jsch/scriptExecutor.java b/Dozentenmodul/src/Jsch/scriptExecutor.java
deleted file mode 100644
index 0ded43b8..00000000
--- a/Dozentenmodul/src/Jsch/scriptExecutor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package Jsch;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.util.Properties;

-import com.jcraft.jsch.ChannelExec;

-import com.jcraft.jsch.JSch;

-import com.jcraft.jsch.JSchException;

-import com.jcraft.jsch.Session;

-

-public class scriptExecutor {

-

-	/**

-	 * @param args

-	 */

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

-		// TODO Auto-generated method stub

-		executeScript();

-	}

-	

-	public static void executeScript()

-	{

-		JSch j=new JSch();

-		

-		try {

-			Session se=j.getSession("root", "141.79.128.121", 22);

-			

-			Properties config = new Properties();

-	        config.setProperty("StrictHostKeyChecking", "no");

-	        se.setConfig(config);

-	        se.setPassword("!N4ye,04u.");

-	        se.connect();

-			ChannelExec ch=(ChannelExec) se.openChannel("exec");

-			InputStream is=ch.getInputStream();

-			

-			ch.setCommand("sh /home/openslx/hello.sh 'test'");

-			//ch.setCommand("ls");

-			ch.connect();

-			

-			BufferedReader reader = new BufferedReader(new InputStreamReader(is));

-	        String line;

-	        int index = 0;

-

-	        while ((line = reader.readLine()) != null)

-	        {

-	            System.out.println(++index + " : " + line);

-	        }

-	        

-	        ch.disconnect();

-	        se.disconnect();

-

-	        System.out.println("Done!");

-		} catch (JSchException | IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-	}

-

-}

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index aafc7372..f16a7594 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,54 +1,43 @@
-package Models;
+package models;
 
 public class Image {
-	
-	private String Imagename;
-	private boolean licenseneed;
+	private String imagename;
+	private boolean licensed;
 	private boolean internet;
 	private int ram;
 	private int cpu;
 	
-	public static Image image=new Image();
+	public static Image image =new Image();
+	
 	public String getImagename() {
-		return Imagename;
+		return imagename;
 	}
-
 	public void setImagename(String imagename) {
-		Imagename = imagename;
+		this.imagename = imagename;
 	}
-
-	public boolean isLicenseneed() {
-		return licenseneed;
+	public boolean isLicensed() {
+		return licensed;
 	}
-
-	public void setLicenseneed(boolean licenseneed) {
-		this.licenseneed = licenseneed;
+	public void setLicensed(boolean licensed) {
+		this.licensed = licensed;
 	}
-
 	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/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java
index 4eb755e9..383bded9 100644
--- a/Dozentenmodul/src/Models/Lecture.java
+++ b/Dozentenmodul/src/Models/Lecture.java
@@ -1,4 +1,4 @@
-package Models;
+package models;
 
 import java.util.Date;
 
diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index 46b7ec69..c106ec12 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -1,6 +1,5 @@
-package Models;

+package models;

 

-import java.io.Serializable;

 

 public class person{

 

diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java
index bfe81c29..07074cf9 100644
--- a/Dozentenmodul/src/Models/vm.java
+++ b/Dozentenmodul/src/Models/vm.java
@@ -1,4 +1,4 @@
-package Models;

+package models;

 

 import java.awt.List;

 import java.util.Date;

diff --git a/Dozentenmodul/src/downloader/DownloadTask.java b/Dozentenmodul/src/ftp/DownloadTask.java
index 9cae23ed..8a643325 100644
--- a/Dozentenmodul/src/downloader/DownloadTask.java
+++ b/Dozentenmodul/src/ftp/DownloadTask.java
@@ -1,111 +1,112 @@
-package downloader;

-

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.InputStream;

-

-import javax.swing.JOptionPane;

-import javax.swing.SwingWorker;

-import GUI.FTPDownloader_GUI;

-

-/**

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

- * @author www.codejava.net

- *

- */

-public class DownloadTask extends SwingWorker<Void, Void> {

-

-	private static final int BUFFER_SIZE = 4096;

-	

-	private String host;

-	private int port;

-	private String username;

-	private String password;

-	

-	private String downloadPath;

-	private String saveDir;

-	

-	@SuppressWarnings("unused")

-	private FTPDownloader_GUI gui;

-	

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

-			String password, String downloadPath, String saveDir,

-			FTPDownloader_GUI gui) {

-		this.host = host;

-		this.port = port;

-		this.username = username;

-		this.password = password;

-		this.downloadPath = downloadPath;

-		this.saveDir = saveDir;

-		this.gui = gui;

-		

-	}

-

-	/**

-	 * Executed in background thread

-	 */	

-	@Override

-	protected Void doInBackground() throws Exception {

-		FTPUtility util = new FTPUtility(host, port, username, password);

-		try {

-			util.connect();

-			

-			byte[] buffer = new byte[BUFFER_SIZE];

-			int bytesRead = -1;

-			long totalBytesRead = 0;

-			int percentCompleted = 0;

-            long start=System.nanoTime();

-            final double NANOS_PER_SECOND = 1000000000.0;

-            final double BYTES_PER_MIB = 1024*1024;

-			long fileSize = util.getFileSize(downloadPath);

-			//gui.setFileSize(fileSize);

-			

-			String fileName = new File(downloadPath).getName();

-			

-			File downloadFile = new File(saveDir + File.separator + fileName);

-			FileOutputStream outputStream = new FileOutputStream(downloadFile);

-			

-			util.downloadFile(downloadPath);

-			InputStream inputStream = util.getInputStream();

-			

-			while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {

-				outputStream.write(buffer, 0, bytesRead);

-				totalBytesRead += bytesRead;

-				//System.out.println(totalBytesRead);

-				double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);

-				percentCompleted = (int) (totalBytesRead * 100 / fileSize);

-				setProgress(percentCompleted);

-				firePropertyChange("speed", 0, speed);

-				firePropertyChange("filesize", 0,fileSize);

-				firePropertyChange("bytesread", 0,totalBytesRead);

-				

-			}

-

-			outputStream.close();

-			

-			util.finish();

-		} catch (FTPException ex) {

-			JOptionPane.showMessageDialog(null, "Error downloading file: " + ex.getMessage(),

-					"Error", JOptionPane.ERROR_MESSAGE);			

-			ex.printStackTrace();

-			setProgress(0);

-			cancel(true);			

-		} finally {

-			util.disconnect();

-		}

-		

-		return null;

-	}

-

-	/**

-	 * Executed in Swing's event dispatching thread

-	 */

-	@Override

-	protected void done() {

-		if (!isCancelled()) {

-			JOptionPane.showMessageDialog(null,

-					"File has been downloaded successfully!", "Message",

-					JOptionPane.INFORMATION_MESSAGE);

-		}

-	}	

+package ftp;
+
+import gui.FTPDownloader_GUI;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+
+/**
+ * Execute file download in a background thread and update the progress. 
+ * @author www.codejava.net
+ *
+ */
+public class DownloadTask extends SwingWorker<Void, Void> {
+
+	private static final int BUFFER_SIZE = 4096;
+	
+	private String host;
+	private int port;
+	private String username;
+	private String password;
+	
+	private String downloadPath;
+	private String saveDir;
+	
+	@SuppressWarnings("unused")
+	private FTPDownloader_GUI gui;
+	
+	public DownloadTask(String host, int port, String username,
+			String password, String downloadPath, String saveDir,
+			FTPDownloader_GUI gui) {
+		this.host = host;
+		this.port = port;
+		this.username = username;
+		this.password = password;
+		this.downloadPath = downloadPath;
+		this.saveDir = saveDir;
+		this.gui = gui;
+		
+	}
+
+	/**
+	 * Executed in background thread
+	 */	
+	@Override
+	protected Void doInBackground() throws Exception {
+		FTPUtility util = new FTPUtility(host, port, username, password);
+		try {
+			util.connect();
+			
+			byte[] buffer = new byte[BUFFER_SIZE];
+			int bytesRead = -1;
+			long totalBytesRead = 0;
+			int percentCompleted = 0;
+            long start=System.nanoTime();
+            final double NANOS_PER_SECOND = 1000000000.0;
+            final double BYTES_PER_MIB = 1024*1024;
+			long fileSize = util.getFileSize(downloadPath);
+			//gui.setFileSize(fileSize);
+			
+			String fileName = new File(downloadPath).getName();
+			
+			File downloadFile = new File(saveDir + File.separator + fileName);
+			FileOutputStream outputStream = new FileOutputStream(downloadFile);
+			
+			util.downloadFile(downloadPath);
+			InputStream inputStream = util.getInputStream();
+			
+			while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {
+				outputStream.write(buffer, 0, bytesRead);
+				totalBytesRead += bytesRead;
+				//System.out.println(totalBytesRead);
+				double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);
+				percentCompleted = (int) (totalBytesRead * 100 / fileSize);
+				setProgress(percentCompleted);
+				firePropertyChange("speed", 0, speed);
+				firePropertyChange("filesize", 0,fileSize);
+				firePropertyChange("bytesread", 0,totalBytesRead);
+				
+			}
+
+			outputStream.close();
+			
+			util.finish();
+		} catch (FTPException ex) {
+			JOptionPane.showMessageDialog(null, "Error downloading file: " + ex.getMessage(),
+					"Error", JOptionPane.ERROR_MESSAGE);			
+			ex.printStackTrace();
+			setProgress(0);
+			cancel(true);			
+		} finally {
+			util.disconnect();
+		}
+		
+		return null;
+	}
+
+	/**
+	 * Executed in Swing's event dispatching thread
+	 */
+	@Override
+	protected void done() {
+		if (!isCancelled()) {
+			JOptionPane.showMessageDialog(null,
+					"File has been downloaded successfully!", "Message",
+					JOptionPane.INFORMATION_MESSAGE);
+		}
+	}	
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/downloader/FTPException.java b/Dozentenmodul/src/ftp/FTPException.java
index 33ba32be..bc3193e0 100644
--- a/Dozentenmodul/src/downloader/FTPException.java
+++ b/Dozentenmodul/src/ftp/FTPException.java
@@ -1,8 +1,8 @@
-package downloader;

-

-@SuppressWarnings("serial")

-public class FTPException extends Exception {

-	public FTPException(String message) {

-		super(message);

-	}

+package ftp;
+
+@SuppressWarnings("serial")
+public class FTPException extends Exception {
+	public FTPException(String message) {
+		super(message);
+	}
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/downloader/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java
index bc45e69f..c62ba07d 100644
--- a/Dozentenmodul/src/downloader/FTPUtility.java
+++ b/Dozentenmodul/src/ftp/FTPUtility.java
@@ -1,230 +1,230 @@
-package downloader;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.net.SocketException;

-import java.security.NoSuchAlgorithmException;

-import org.apache.commons.net.ftp.FTP;

-import org.apache.commons.net.ftp.FTPFile;

-import org.apache.commons.net.ftp.FTPReply;

-import org.apache.commons.net.ftp.FTPSClient;

-

-

-/**

- * A utility class that provides functionality for downloading files from a FTP

- * server.

- * 

- * @author www.codejava.net

- * 

- */

-public class FTPUtility {

-

-	// FTP server information

-	private String host;

-	private int port;

-	private String username;

-	private String password;

-

-	private FTPSClient ftpClient = new FTPSClient();

-	private int replyCode;

-

-	private InputStream inputStream;

-	private OutputStream outputStream;

-

-	public FTPUtility(String host, int port, String user, String pass) {

-		this.host = host;

-		this.port = port;

-		this.username = user;

-		this.password = pass;

-	}

-

-	/**

-	 * Connect and login to the server.

-	 * 

-	 * @throws FTPException

-	 * @throws NoSuchAlgorithmException 

-	 */

-	public void connect() throws FTPException, NoSuchAlgorithmException {

-		try {

-			ftpClient.connect(host, port);

-			replyCode = ftpClient.getReplyCode();

-			if (!FTPReply.isPositiveCompletion(replyCode)) {

-				throw new FTPException("FTP serve refused connection.");

-			}

-			

-			

-			boolean logged = ftpClient.login(username, password);

-			if (!logged) {

-				// failed to login

-				ftpClient.execPROT("P");

-				ftpClient.disconnect();

-				throw new FTPException("Could not login to the server.");

-			}

-

-			ftpClient.enterLocalPassiveMode();

-

-		} catch (IOException ex) {

-			throw new FTPException("I/O error: " + ex.getMessage());

-		}

-	}

-

-	/**

-	 * Gets size (in bytes) of the file on the server.

-	 * 

-	 * @param filePath

-	 *            Path of the file on server

-	 * @return file size in bytes

-	 * @throws FTPException

-	 */

-	public long getFileSize(String filePath) throws FTPException {

-		try {

-			FTPFile file = ftpClient.mlistFile(filePath);

-			if (file == null) {

-				throw new FTPException("The file may not exist on the server!");

-			}

-			return file.getSize();

-		} catch (IOException ex) {

-			throw new FTPException("Could not determine size of the file: "

-					+ ex.getMessage());

-		}

-	}

-

-	/**

-	 * Start downloading a file from the server

-	 * 

-	 * @param downloadPath

-	 *            Full path of the file on the server

-	 * @throws FTPException

-	 *             if client-server communication error occurred

-	 */

-	public void downloadFile(String downloadPath) throws FTPException {

-		try {

-

-			boolean success = ftpClient.setFileType(FTP.BINARY_FILE_TYPE);

-			if (!success) {

-				throw new FTPException("Could not set binary file type.");

-			}

-

-			inputStream = ftpClient.retrieveFileStream(downloadPath);

-

-			if (inputStream == null) {

-				throw new FTPException(

-						"Could not open input stream. The file may not exist on the server.");

-			}

-		} catch (IOException ex) {

-			throw new FTPException("Error downloading file: " + ex.getMessage());

-		}

-	}

-	

-	 

-    /**

-     * Start uploading a file to the server

-     * @param uploadFile the file to be uploaded

-     * @param destDir destination directory on the server

-     * where the file is stored

-     * @throws FTPException if client-server communication error occurred

-     */

-    public void uploadFile(File uploadFile, String destDir) throws FTPException {

-        try {

-            boolean success = ftpClient.changeWorkingDirectory(destDir);

-            if (!success) {

-                throw new FTPException("Could not change working directory to "

-                        + destDir + ". The directory may not exist.");

-            }

-             

-            success = ftpClient.setFileType(FTP.BINARY_FILE_TYPE);         

-            if (!success) {

-                throw new FTPException("Could not set binary file type.");

-            }

-             

-            outputStream = ftpClient.storeFileStream(uploadFile.getName());

-           // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname());

-        } catch (IOException ex) {

-            throw new FTPException("Error uploading file: " + ex.getMessage());

-        }

-    }

- 

-    /**

-     * Write an array of bytes to the output stream.

-     */

-    public void writeFileBytes(byte[] bytes, int offset, int length)

-            throws IOException {

-        outputStream.write(bytes, offset, length);

-    }

-

-	/**

-	 * Complete the download operation.

-	 */

-	public void finish() throws IOException {

-		inputStream.close();

-		ftpClient.completePendingCommand();

-	}

-

-	/**

-	 * Log out and disconnect from the server

-	 */

-	public void disconnect() throws FTPException {

-		if (ftpClient.isConnected()) {

-			try {

-				if (!ftpClient.logout()) {

-					throw new FTPException("Could not log out from the server");

-				}

-				ftpClient.disconnect();

-			} catch (IOException ex) {

-				throw new FTPException("Error disconnect from the server: "

-						+ ex.getMessage());

-			}

-		}

-	}

-

-	/**

-	 * Return InputStream of the remote file on the server.

-	 */

-	public InputStream getInputStream() {

-		return inputStream;

-	}

-	

-	public OutputStream getOutputStream() {

-		return outputStream;

-	}

-	

-	public String[] getAllRohling(String SearchString) throws SocketException

-	{

-		//FTPClient ftp=new FTPClient();

-		

-		String[] filenamelist;

-		

-		

-		try {

-			

-			

-			ftpClient.changeWorkingDirectory("/home/openslx/images");

-			filenamelist=ftpClient.listNames();

-			

-			String[] search=new String[filenamelist.length];

-			for(int i=0;i<filenamelist.length;i++)

-			{

-				/*if(filenamelist[i].startsWith(SearchString)==true)

-				{

-					search[i]=filenamelist[i];

-				}*/

-				

-				if(filenamelist[i].contains(SearchString)==true)

-				{

-					search[i]=filenamelist[i];

-				}

-			}

-			return search;

-		} catch (IOException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-

-

-			

-		return null;		

-	}

-

+package ftp;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketException;
+import java.security.NoSuchAlgorithmException;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.apache.commons.net.ftp.FTPSClient;
+
+
+/**
+ * A utility class that provides functionality for downloading files from a FTP
+ * server.
+ * 
+ * @author www.codejava.net
+ * 
+ */
+public class FTPUtility {
+
+	// FTP server information
+	private String host;
+	private int port;
+	private String username;
+	private String password;
+
+	private FTPSClient ftpClient = new FTPSClient();
+	private int replyCode;
+
+	private InputStream inputStream;
+	private OutputStream outputStream;
+
+	public FTPUtility(String host, int port, String user, String pass) {
+		this.host = host;
+		this.port = port;
+		this.username = user;
+		this.password = pass;
+	}
+
+	/**
+	 * Connect and login to the server.
+	 * 
+	 * @throws FTPException
+	 * @throws NoSuchAlgorithmException 
+	 */
+	public void connect() throws FTPException, NoSuchAlgorithmException {
+		try {
+			ftpClient.connect(host, port);
+			replyCode = ftpClient.getReplyCode();
+			if (!FTPReply.isPositiveCompletion(replyCode)) {
+				throw new FTPException("FTP serve refused connection.");
+			}
+			
+			
+			boolean logged = ftpClient.login(username, password);
+			if (!logged) {
+				// failed to login
+				ftpClient.execPROT("P");
+				ftpClient.disconnect();
+				throw new FTPException("Could not login to the server.");
+			}
+
+			ftpClient.enterLocalPassiveMode();
+
+		} catch (IOException ex) {
+			throw new FTPException("I/O error: " + ex.getMessage());
+		}
+	}
+
+	/**
+	 * Gets size (in bytes) of the file on the server.
+	 * 
+	 * @param filePath
+	 *            Path of the file on server
+	 * @return file size in bytes
+	 * @throws FTPException
+	 */
+	public long getFileSize(String filePath) throws FTPException {
+		try {
+			FTPFile file = ftpClient.mlistFile(filePath);
+			if (file == null) {
+				throw new FTPException("The file may not exist on the server!");
+			}
+			return file.getSize();
+		} catch (IOException ex) {
+			throw new FTPException("Could not determine size of the file: "
+					+ ex.getMessage());
+		}
+	}
+
+	/**
+	 * Start downloading a file from the server
+	 * 
+	 * @param downloadPath
+	 *            Full path of the file on the server
+	 * @throws FTPException
+	 *             if client-server communication error occurred
+	 */
+	public void downloadFile(String downloadPath) throws FTPException {
+		try {
+
+			boolean success = ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+			if (!success) {
+				throw new FTPException("Could not set binary file type.");
+			}
+
+			inputStream = ftpClient.retrieveFileStream(downloadPath);
+
+			if (inputStream == null) {
+				throw new FTPException(
+						"Could not open input stream. The file may not exist on the server.");
+			}
+		} catch (IOException ex) {
+			throw new FTPException("Error downloading file: " + ex.getMessage());
+		}
+	}
+	
+	 
+    /**
+     * Start uploading a file to the server
+     * @param uploadFile the file to be uploaded
+     * @param destDir destination directory on the server
+     * where the file is stored
+     * @throws FTPException if client-server communication error occurred
+     */
+    public void uploadFile(File uploadFile, String destDir) throws FTPException {
+        try {
+            boolean success = ftpClient.changeWorkingDirectory(destDir);
+            if (!success) {
+                throw new FTPException("Could not change working directory to "
+                        + destDir + ". The directory may not exist.");
+            }
+             
+            success = ftpClient.setFileType(FTP.BINARY_FILE_TYPE);         
+            if (!success) {
+                throw new FTPException("Could not set binary file type.");
+            }
+             
+            outputStream = ftpClient.storeFileStream(uploadFile.getName());
+           // ftpClient.rename(uploadFile.getName(), vm.vl.getLaborname());
+        } catch (IOException ex) {
+            throw new FTPException("Error uploading file: " + ex.getMessage());
+        }
+    }
+ 
+    /**
+     * Write an array of bytes to the output stream.
+     */
+    public void writeFileBytes(byte[] bytes, int offset, int length)
+            throws IOException {
+        outputStream.write(bytes, offset, length);
+    }
+
+	/**
+	 * Complete the download operation.
+	 */
+	public void finish() throws IOException {
+		inputStream.close();
+		ftpClient.completePendingCommand();
+	}
+
+	/**
+	 * Log out and disconnect from the server
+	 */
+	public void disconnect() throws FTPException {
+		if (ftpClient.isConnected()) {
+			try {
+				if (!ftpClient.logout()) {
+					throw new FTPException("Could not log out from the server");
+				}
+				ftpClient.disconnect();
+			} catch (IOException ex) {
+				throw new FTPException("Error disconnect from the server: "
+						+ ex.getMessage());
+			}
+		}
+	}
+
+	/**
+	 * Return InputStream of the remote file on the server.
+	 */
+	public InputStream getInputStream() {
+		return inputStream;
+	}
+	
+	public OutputStream getOutputStream() {
+		return outputStream;
+	}
+	
+	public String[] getAllRohling(String SearchString) throws SocketException
+	{
+		//FTPClient ftp=new FTPClient();
+		
+		String[] filenamelist;
+		
+		
+		try {
+			
+			
+			ftpClient.changeWorkingDirectory("/home/openslx/images");
+			filenamelist=ftpClient.listNames();
+			
+			String[] search=new String[filenamelist.length];
+			for(int i=0;i<filenamelist.length;i++)
+			{
+				/*if(filenamelist[i].startsWith(SearchString)==true)
+				{
+					search[i]=filenamelist[i];
+				}*/
+				
+				if(filenamelist[i].contains(SearchString)==true)
+				{
+					search[i]=filenamelist[i];
+				}
+			}
+			return search;
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+
+			
+		return null;		
+	}
+
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/downloader/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index 6d7de00f..e5d8a817 100644
--- a/Dozentenmodul/src/downloader/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -1,93 +1,93 @@
-package downloader;

- 

-import java.io.File;

-import java.io.FileInputStream;

- 

-import javax.swing.JOptionPane;

-import javax.swing.SwingWorker;

- 

-/**

- * Executes the file upload in a background thread and updates progress to

- * listeners that implement the java.beans.PropertyChangeListener interface.

- * @author www.codejava.net

- *

- */

-public class UploadTask extends SwingWorker<Void, Void> {

-    private static final int BUFFER_SIZE = 4096;

-     

-    private String host;

-    private int port;

-    private String username;

-    private String password;

-     

-    private String destDir;

-    private File uploadFile;

-     

-    public UploadTask(String host, int port, String username, String password,

-            String destDir, File uploadFile) {

-        this.host = host;

-        this.port = port;

-        this.username = username;

-        this.password = password;

-        this.destDir = destDir;

-        this.uploadFile = uploadFile;

-    }

- 

-    /**

-     * Executed in background thread

-     */

-    @Override

-    protected Void doInBackground() throws Exception {

-        FTPUtility util = new FTPUtility(host, port, username, password);

-        try {

-            util.connect();

-            util.uploadFile(uploadFile, destDir);

-             

-            FileInputStream inputStream = new FileInputStream(uploadFile);

-            byte[] buffer = new byte[BUFFER_SIZE];

-            int bytesRead = -1;

-            long totalBytesRead = 0;

-            int percentCompleted = 0;

-            long fileSize = uploadFile.length();

-            long start=System.nanoTime();

-            final double NANOS_PER_SECOND = 1000000000.0;

-            final double BYTES_PER_MIB = 1024*1024;

-            while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {

-                util.writeFileBytes(buffer, 0, bytesRead);

-                totalBytesRead += bytesRead;

-                percentCompleted = (int) (totalBytesRead * 100 / fileSize);

-                double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);

-                setProgress(percentCompleted);

-                firePropertyChange("speed", 0, speed);

-				firePropertyChange("filesize", 0,fileSize);

-				firePropertyChange("bytesread", 0,totalBytesRead);

-            }

- 

-            inputStream.close();

-             

-            util.finish();

-        } catch (FTPException ex) {

-            JOptionPane.showMessageDialog(null, "Error uploading file: " + ex.getMessage(),

-                    "Error", JOptionPane.ERROR_MESSAGE);           

-            ex.printStackTrace();

-            setProgress(0);

-            cancel(true);          

-        } finally {

-            util.disconnect();

-        }

-         

-        return null;

-    }

- 

-    /**

-     * Executed in Swing's event dispatching thread

-     */

-    @Override

-    protected void done() {

-        if (!isCancelled()) {

-            JOptionPane.showMessageDialog(null,

-                    "File has been uploaded successfully!", "Message",

-                    JOptionPane.INFORMATION_MESSAGE);

-        }

-    }  

+package ftp;
+ 
+import java.io.File;
+import java.io.FileInputStream;
+ 
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+ 
+/**
+ * Executes the file upload in a background thread and updates progress to
+ * listeners that implement the java.beans.PropertyChangeListener interface.
+ * @author www.codejava.net
+ *
+ */
+public class UploadTask extends SwingWorker<Void, Void> {
+    private static final int BUFFER_SIZE = 4096;
+     
+    private String host;
+    private int port;
+    private String username;
+    private String password;
+     
+    private String destDir;
+    private File uploadFile;
+     
+    public UploadTask(String host, int port, String username, String password,
+            String destDir, File uploadFile) {
+        this.host = host;
+        this.port = port;
+        this.username = username;
+        this.password = password;
+        this.destDir = destDir;
+        this.uploadFile = uploadFile;
+    }
+ 
+    /**
+     * Executed in background thread
+     */
+    @Override
+    protected Void doInBackground() throws Exception {
+        FTPUtility util = new FTPUtility(host, port, username, password);
+        try {
+            util.connect();
+            util.uploadFile(uploadFile, destDir);
+             
+            FileInputStream inputStream = new FileInputStream(uploadFile);
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int bytesRead = -1;
+            long totalBytesRead = 0;
+            int percentCompleted = 0;
+            long fileSize = uploadFile.length();
+            long start=System.nanoTime();
+            final double NANOS_PER_SECOND = 1000000000.0;
+            final double BYTES_PER_MIB = 1024*1024;
+            while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {
+                util.writeFileBytes(buffer, 0, bytesRead);
+                totalBytesRead += bytesRead;
+                percentCompleted = (int) (totalBytesRead * 100 / fileSize);
+                double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);
+                setProgress(percentCompleted);
+                firePropertyChange("speed", 0, speed);
+				firePropertyChange("filesize", 0,fileSize);
+				firePropertyChange("bytesread", 0,totalBytesRead);
+            }
+ 
+            inputStream.close();
+             
+            util.finish();
+        } catch (FTPException ex) {
+            JOptionPane.showMessageDialog(null, "Error uploading file: " + ex.getMessage(),
+                    "Error", JOptionPane.ERROR_MESSAGE);           
+            ex.printStackTrace();
+            setProgress(0);
+            cancel(true);          
+        } finally {
+            util.disconnect();
+        }
+         
+        return null;
+    }
+ 
+    /**
+     * Executed in Swing's event dispatching thread
+     */
+    @Override
+    protected void done() {
+        if (!isCancelled()) {
+            JOptionPane.showMessageDialog(null,
+                    "File has been uploaded successfully!", "Message",
+                    JOptionPane.INFORMATION_MESSAGE);
+        }
+    }  
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/BillOfRights_GUI.java b/Dozentenmodul/src/gui/BillOfRights_GUI.java
new file mode 100644
index 00000000..6f66d479
--- /dev/null
+++ b/Dozentenmodul/src/gui/BillOfRights_GUI.java
@@ -0,0 +1,181 @@
+package gui;
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+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.JFrame;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.JCheckBox;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.JTextArea;
+
+
+
+@SuppressWarnings("serial")
+public class BillOfRights_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JButton fwdButton;
+	JCheckBox chckbxAkzeptieren;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			BillOfRights_GUI dialog = new BillOfRights_GUI();
+			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public BillOfRights_GUI() {
+
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("Dozentenmodul *Prototyp*");
+		
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 545, 366);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 567, 60);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Hinweis");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 95, 567, 485);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JTextArea txtrLoremIpsumDolor = new JTextArea();
+		txtrLoremIpsumDolor.setWrapStyleWord(true);
+		txtrLoremIpsumDolor.setLineWrap(true);
+		txtrLoremIpsumDolor.setEditable(false);
+		JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor);
+		scr.setBounds(0, 0, 567, 477);
+		txtrLoremIpsumDolor.setBounds(0, 0, 567, 477);
+		txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo");
+		
+		contentPanel.add(scr);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 630, 587, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				fwdButton = new JButton("Weiter");
+				fwdButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						VmWareLink_GUI ac=new VmWareLink_GUI();
+						ac.setVisible(true);
+						dispose();
+					}
+				});
+				fwdButton.setEnabled(false);
+		
+				buttonPane.add(fwdButton);
+			}
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 617, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 82, 587, 2);
+			getContentPane().add(separator);
+		}
+		
+		chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.");
+		chckbxAkzeptieren.addChangeListener(new ChangeListener() {
+			public void stateChanged(ChangeEvent arg0) {
+				if(chckbxAkzeptieren.isSelected()==true)
+				{
+					fwdButton.setEnabled(true);
+
+				}
+				else
+				{
+					
+				}
+			}
+		});
+		chckbxAkzeptieren.setBackground(SystemColor.menu);
+		chckbxAkzeptieren.setBounds(10, 587, 567, 23);
+		getContentPane().add(chckbxAkzeptieren);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER);
+		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/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
new file mode 100644
index 00000000..784c66a7
--- /dev/null
+++ b/Dozentenmodul/src/gui/EditImageAllgemein_GUI.java
@@ -0,0 +1,336 @@
+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 java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+
+import models.Image;
+import models.person;
+
+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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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(person.verantowrtlicher.getVorname());
+		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(person.verantowrtlicher.getName());
+		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(person.verantowrtlicher.getHochschule());
+		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(person.verantowrtlicher.getEMail());
+		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(person.verantowrtlicher.getTel());
+		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(person.verantowrtlicher.getFakultät());
+		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(Image.image.getImagename());
+		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..a3fdcf20
--- /dev/null
+++ b/Dozentenmodul/src/gui/EditImageTechnisch_GUI.java
@@ -0,0 +1,311 @@
+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 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 models.Image;
+
+@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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
new file mode 100644
index 00000000..4eb5c609
--- /dev/null
+++ b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
@@ -0,0 +1,337 @@
+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 java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import javax.swing.JTextArea;
+
+import models.Image;
+import models.person;
+
+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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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..62cfd19a
--- /dev/null
+++ b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java
@@ -0,0 +1,346 @@
+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 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 models.Image;
+
+@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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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);
+		
+		rdbtnInternetJa = new JRadioButton("Ja");
+		buttonGroupInternet.add(rdbtnInternetJa);
+		rdbtnInternetJa.setBounds(266, 57, 109, 23);
+		panel_1.add(rdbtnInternetJa);
+		
+		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) {
+						
+						if(rdbtnInternetJa.isSelected()==true)
+						{
+							Image.image.setInternet(true);
+						}
+						else
+						{
+							Image.image.setInternet(false);
+						}
+						
+						if(rdbtnlicenseJa.isSelected()==true)
+						{
+							Image.image.setLicensed(true);
+						}
+						else
+						{
+							Image.image.setLicensed(false);
+						}
+						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) {
+						if(rdbtnInternetJa.isSelected()==true)
+						{
+							Image.image.setInternet(true);
+						}
+						else
+						{
+							Image.image.setInternet(false);
+						}
+						
+						if(rdbtnlicenseJa.isSelected()==true)
+						{
+							Image.image.setLicensed(true);
+						}
+						else
+						{
+							Image.image.setLicensed(false);
+						}
+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
+						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/EingabeVeranstaltungAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
new file mode 100644
index 00000000..045f8a84
--- /dev/null
+++ b/Dozentenmodul/src/gui/EingabeVeranstaltungAllgemein_GUI.java
@@ -0,0 +1,338 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+import models.Lecture;
+import models.person;
+
+
+@SuppressWarnings("serial")
+public class EingabeVeranstaltungAllgemein_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 {
+			EingabeVeranstaltungAllgemein_GUI dialog = new EingabeVeranstaltungAllgemein_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EingabeVeranstaltungAllgemein_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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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("Veranstaltungsname: *");
+		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) {
+				
+				EingabeVeranstaltungAllgemein_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());
+						Lecture.lecture.setName(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());
+						Lecture.lecture.setName(imagename.getText());
+						EingabeVeranstatlungTechnisch_GUI ea=new EingabeVeranstatlungTechnisch_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/EingabeVeranstatlungTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeVeranstatlungTechnisch_GUI.java
new file mode 100644
index 00000000..3733b200
--- /dev/null
+++ b/Dozentenmodul/src/gui/EingabeVeranstatlungTechnisch_GUI.java
@@ -0,0 +1,317 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.ScrollPane;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+
+import models.Lecture;
+
+
+import com.toedter.calendar.JDateChooser;
+
+@SuppressWarnings("serial")
+public class EingabeVeranstatlungTechnisch_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private JTextField textFieldLaborname;
+	JRadioButton rdbtnJa;
+	JDateChooser dateChooserend;
+	JDateChooser dateChooserstart;
+	JTextArea textAreashort;
+	JTextArea textArealong;
+	private final ButtonGroup buttonGroup = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			EingabeVeranstatlungTechnisch_GUI dialog = new EingabeVeranstatlungTechnisch_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public EingabeVeranstatlungTechnisch_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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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("Dateneingabe f\u00FCr Veranstaltung");
+				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, 531);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EingabeVeranstatlungTechnisch_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("Veranstaltung ");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 74, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(152, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Neu");
+		lblNewLabel_1.setBounds(165, 11, 46, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JLabel lblLabornameanzeigename = new JLabel("Laborname (Anzeigename): *");
+		lblLabornameanzeigename.setBounds(10, 57, 250, 14);
+		contentPanel.add(lblLabornameanzeigename);
+		
+		textFieldLaborname = new JTextField();
+		textFieldLaborname.setBounds(270, 54, 307, 20);
+		contentPanel.add(textFieldLaborname);
+		textFieldLaborname.setColumns(10);
+		
+		JLabel lblKurzbeschreibung = new JLabel("Kurzbeschreibung: *");
+		lblKurzbeschreibung.setBounds(10, 109, 250, 14);
+		contentPanel.add(lblKurzbeschreibung);
+		
+		ScrollPane scrollPane = new ScrollPane();
+		scrollPane.setBounds(270, 109, 307, 137);
+		contentPanel.add(scrollPane);
+		
+		textAreashort = new JTextArea();
+		textAreashort.setLineWrap(true);
+		scrollPane.add(textAreashort);
+		textAreashort.setBounds(0, 0, 4, 22);
+		
+		ScrollPane scrollPane_1 = new ScrollPane();
+		scrollPane_1.setBounds(270, 249, 307, 137);
+		contentPanel.add(scrollPane_1);
+		
+		textArealong = new JTextArea();
+		textArealong.setLineWrap(true);
+		textArealong.setBounds(0, 0, 4, 22);
+		scrollPane_1.add(textArealong);
+		
+		JLabel label = new JLabel("Kurzbeschreibung: *");
+		label.setBounds(0, 252, 250, 14);
+		contentPanel.add(label);
+		
+		JLabel lblGltigkeitsdatum = new JLabel("G\u00FCltigkeitsdatum: *");
+		lblGltigkeitsdatum.setBounds(0, 397, 250, 14);
+		contentPanel.add(lblGltigkeitsdatum);
+		
+		JLabel lblVon = new JLabel("von:");
+		lblVon.setBounds(270, 394, 30, 20);
+		contentPanel.add(lblVon);
+		
+		dateChooserstart = new JDateChooser();
+		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
+		dateChooserstart.setBounds(332, 391, 101, 20);
+		contentPanel.add(dateChooserstart);
+		
+		JLabel lblBis = new JLabel("bis");
+		lblBis.setBounds(443, 394, 24, 20);
+		contentPanel.add(lblBis);
+		
+		dateChooserend = new JDateChooser();
+		dateChooserend.setDateFormatString("dd.MM.yyyy hh:mm:ss");
+		dateChooserend.setBounds(477, 392, 100, 20);
+		contentPanel.add(dateChooserend);
+		
+		JLabel lblAktiv = new JLabel("Aktiv:");
+		lblAktiv.setBounds(0, 450, 250, 14);
+		contentPanel.add(lblAktiv);
+		
+		JLabel lblimVmchooserSichtbar = new JLabel("(Im VMChooser sichtbar)");
+		lblimVmchooserSichtbar.setBounds(0, 475, 250, 14);
+		contentPanel.add(lblimVmchooserSichtbar);
+		
+		rdbtnJa = new JRadioButton("Ja");
+		rdbtnJa.setSelected(true);
+		buttonGroup.add(rdbtnJa);
+		rdbtnJa.setBounds(270, 446, 109, 23);
+		contentPanel.add(rdbtnJa);
+		
+		JRadioButton rdbtnNein = new JRadioButton("Nein");
+		buttonGroup.add(rdbtnNein);
+		rdbtnNein.setBounds(381, 446, 109, 23);
+		contentPanel.add(rdbtnNein);
+		//contentPanel.add(textArea);
+		{
+			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) {
+						
+						if(rdbtnJa.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(textArealong.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setShortDesc(textAreashort.getText());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+
+						
+						EingabeVeranstaltungAllgemein_GUI sr=new EingabeVeranstaltungAllgemein_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(rdbtnJa.isSelected()==true)
+						{
+							Lecture.lecture.setActive(true);
+						}
+						else
+						{
+							Lecture.lecture.setActive(false);
+						}
+						
+						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setDesc(textArealong.getText());
+						Lecture.lecture.setEnddate(dateChooserend.getDate());
+						Lecture.lecture.setShortDesc(textAreashort.getText());
+						Lecture.lecture.setStartdate(dateChooserstart.getDate());
+						LinkImage_GUI ea=new LinkImage_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/ExtendedSearch_GUI.java b/Dozentenmodul/src/gui/ExtendedSearch_GUI.java
new file mode 100644
index 00000000..20041516
--- /dev/null
+++ b/Dozentenmodul/src/gui/ExtendedSearch_GUI.java
@@ -0,0 +1,233 @@
+package gui;
+
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+@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<String> comboBox = new JComboBox<String>();
+		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_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
new file mode 100644
index 00000000..94e1e05d
--- /dev/null
+++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
@@ -0,0 +1,348 @@
+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 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 ftp.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;
+
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import server.User;
+import thrift.ThriftConnection;
+
+@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;
+	ThriftConnection thrift=new ThriftConnection();
+	Client client=thrift.getThriftConnection();
+	/**
+	 * 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 {
+						client.DeleteFtpUser(user.userName);
+					} catch (TException 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 - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		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 {
+							client.DeleteFtpUser(user.userName);
+						} catch (TException 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=client.getFtpUser();
+			//downloadPath=client.getPathOfImage(filename);
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+              
+        task = new DownloadTask(host, port, user.userName, user.password,user.path+filename+".vmdk", lblNewLabel.getText(), this);
+        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_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java
new file mode 100644
index 00000000..980f3481
--- /dev/null
+++ b/Dozentenmodul/src/gui/FTPUploader_GUI.java
@@ -0,0 +1,401 @@
+package gui;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JSeparator;
+import javax.swing.JTextPane;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+
+import models.Image;
+import models.person;
+
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import thrift.ThriftConnection;
+import ftp.UploadTask;
+
+
+@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;
+	server.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;
+	ThriftConnection thrift=new ThriftConnection();
+	Client client=thrift.getThriftConnection();
+	/**
+	 * 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 {
+						
+						client.DeleteFtpUser(user.userName);
+					} catch (TException 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 - 722) / 2;
+		int left=(screenSize.width - 603) / 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) {
+						writeData();
+						dispose();
+						MainMenue_GUI m=new MainMenue_GUI();
+						m.setVisible(true);
+						if(taskrun==true)
+						{
+						try {
+							client.DeleteFtpUser(user.userName);
+							
+						} catch (TException  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=client.getFtpUser();
+			System.out.println("name"+user.userName);
+			System.out.println("path"+user.path);
+			System.out.println("pass"+user.password);
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+        task=new UploadTask(host,port,user.userName,user.password,user.path, 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");
+        	
+        }
+		        	
+        }
+	
+    public boolean writeData(){
+    	
+    	try {
+			client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+    	
+    	
+    }
+}
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/LinkImage_GUI.java b/Dozentenmodul/src/gui/LinkImage_GUI.java
new file mode 100644
index 00000000..38b3d5e3
--- /dev/null
+++ b/Dozentenmodul/src/gui/LinkImage_GUI.java
@@ -0,0 +1,433 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.DefaultTableModel;
+
+import models.Lecture;
+import models.person;
+
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import thrift.ThriftConnection;
+
+@SuppressWarnings("serial")
+public class LinkImage_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	JComboBox<String> comboBox;
+	JTable tableAllImages;
+	private JTextField textFieldName;
+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
+	ThriftConnection thrift=new ThriftConnection();
+	Client client=thrift.getThriftConnection();
+
+    
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			LinkImage_GUI dialog = new LinkImage_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public LinkImage_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);
+		
+
+		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
+		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
+		
+		
+		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.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				String stext=textFieldName.getText();
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				
+				if(stext!="")
+				for(int i=0;i<modelAll.getRowCount();i++){
+					
+					if(modelAll.getValueAt(i, 0).toString().startsWith(stext)){
+						
+					}
+					else
+					{
+						modelAll.removeRow(i);
+					}
+				}
+				
+				
+			}
+			
+			
+		});
+
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+		
+		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);
+		
+		comboBox = new JComboBox<String>();
+		try {
+			List<String> list=client.getAllOS();
+			comboBox.addItem("");
+			for(int i=0;i<list.size();i++)
+			{
+			comboBox.addItem(list.get(i));
+			}
+		} catch (TException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				String selItem=comboBox.getSelectedItem().toString();
+				if(selItem!="")
+				{
+				for(int i=0;i<modelAll.getRowCount();i++){
+					
+					if(modelAll.getValueAt(i, 2).equals(selItem)){
+						
+					}
+					else
+					{
+						modelAll.removeRow(i);
+					}
+				}
+				
+				
+			}
+			}
+		});
+		comboBox.setBounds(270, 58, 250, 20);
+		panel_1.add(comboBox);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				LinkImage_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(model);
+		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();
+		
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		tableAllImages=new JTable();
+		tableAllImages.setModel(modelAll);
+		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);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+		
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+		JTable tableCoopImages=new JTable();
+		tableCoopImages.setModel(model);
+		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(model);
+		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(model);
+		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);
+		
+		initTableModel(modelAll);		
+		{
+			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 main=new MainMenue_GUI();
+						main.setVisible(true);
+						dispose();
+					}
+				});
+				okButton.setActionCommand("OK");
+				buttonPane.add(okButton);
+				getRootPane().setDefaultButton(okButton);
+			}
+			{
+				JButton cancelButton = new JButton("Veranstaltung erzeugen und abschlie\u00DFen");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						String imagename=tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 0).toString();
+						try {
+							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+							System.out.println(formatter.format(Lecture.lecture.getStartdate()).toString());
+							client.writeLecturedata(Lecture.lecture.getName(), Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(), formatter.format(Lecture.lecture.getStartdate()).toString(), formatter.format(Lecture.lecture.getEnddate()).toString(), Lecture.lecture.isActive(), imagename, person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät());
+						} catch (TException e1) {
+							// TODO Auto-generated catch block
+							e1.printStackTrace();
+						}
+						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);
+		
+	}
+	
+	public DefaultTableModel initTableModel(DefaultTableModel model){
+		List<server.Image> images;
+		try {
+			images = client.getImageList();
+			Iterator<server.Image> i=images.iterator();
+			List<Object[]> ListObj = new ArrayList<Object[]>();
+			int x=0;
+			
+			while(i.hasNext())
+			{
+				
+				i.next();
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()};
+				ListObj.add(obj);
+				model.addRow(ListObj.get(x));
+				x++;
+				
+			}
+			
+			return model;
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		return model;
+	}
+	
+	}
+
+
diff --git a/Dozentenmodul/src/gui/Login_GUI.java b/Dozentenmodul/src/gui/Login_GUI.java
new file mode 100644
index 00000000..c982fa7b
--- /dev/null
+++ b/Dozentenmodul/src/gui/Login_GUI.java
@@ -0,0 +1,152 @@
+package gui;
+
+
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Image;
+import java.awt.Toolkit;
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JPasswordField;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.SystemColor;
+
+
+@SuppressWarnings("serial")
+public class Login_GUI extends JFrame {
+
+	private JPanel contentPane;
+	private JTextField username;
+	private JPasswordField pass;
+
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					//Aufruf und Anzeige des Login Fensters
+					Login_GUI frame = new Login_GUI();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * Create the frame.
+	 */
+	public Login_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				System.exit(0);
+			}
+		});
+		
+		//Fenster darf nicht vergrößert werden
+		setResizable(false);
+		try {
+			//Setzt das Look and Feel auf System
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		//Titel des Fensters setzen
+		setTitle("Dozentenmodul *Prototyp*");
+		//Aktion die beim Schließen durchgeführt werden soll
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		//Größe des Fensters definieren
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 400) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 400);
+		//Erzeugen eines Panels
+		contentPane = new JPanel();
+		//Hintergrund Farbe des Panels setzen
+		contentPane.setBackground(SystemColor.menu);
+		//Rahmen des Fensters setzen
+		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+		setContentPane(contentPane);
+		//Layout setzen
+		contentPane.setLayout(null);
+		//Label für das Logo erzeugen
+		JLabel imgLabel = new JLabel();
+		//Größe und Position des Logos festelegen
+		imgLabel.setBounds(150, 11, 350, 142);
+		//Pfadangabe des Logos
+		
+		ImageIcon icon = new ImageIcon(getClass().getResource("/Logo_bwLehrpool.png"),"Logo");
+		//Skalierung des Logos
+		Image scaled=icon.getImage().getScaledInstance(270, 64, 0);
+		imgLabel.setIcon(new ImageIcon(scaled));
+		//Hinzufügen des Logos in das Fenster
+		contentPane.add(imgLabel);
+		
+		//Erzeugen und Hinzufügen des Labels 
+		JLabel LabelUser = new JLabel("bwIDM-Benutzername:");
+		LabelUser.setBounds(150, 164, 134, 20);
+		contentPane.add(LabelUser);
+		
+		//Erzeugen und Hinzufügen des Textfeldes
+		username = new JTextField();
+		username.setBounds(343, 164, 125, 20);
+		contentPane.add(username);
+		username.setColumns(10);
+		
+		//Erzeugen und Hinzufügen des Labels
+		JLabel LabelPass = new JLabel("bwIDM-Passwort:");
+		LabelPass.setBounds(150, 195, 134, 20);
+		contentPane.add(LabelPass);
+		
+		//Erzeugen, Hinzufügen und definierung der Aktion des Buttons
+		JButton BtnLogin = new JButton("Login");
+		BtnLogin.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				//Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt
+				//Ldap check=new Ldap();
+				boolean login=true;
+				//boolean login=check.LdapAuth(username.getText(),  new String(pass.getPassword()));
+				if(login==true)
+				{
+					
+					
+					//Erstellen einer Instanz der Aktionsauswahl
+					BillOfRights_GUI re=new BillOfRights_GUI();
+					re.setVisible(true);
+					//Schließen des Fensters nach erfolgreichen Login
+					setVisible(false);
+				}
+				else
+				{
+		            JOptionPane.showMessageDialog(null,
+		                    "Login denied!", "Message",
+		                    JOptionPane.INFORMATION_MESSAGE);
+				}
+			}
+		});
+		BtnLogin.setBounds(343, 244, 125, 23);
+		contentPane.add(BtnLogin);
+		
+		//Erzeugen und Hinzufügen des Passwortfeldes
+		pass = new JPasswordField();
+		pass.setBounds(343, 195, 125, 20);
+		contentPane.add(pass);
+	}
+}
diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java
new file mode 100644
index 00000000..e44e5c90
--- /dev/null
+++ b/Dozentenmodul/src/gui/MainMenue_GUI.java
@@ -0,0 +1,325 @@
+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.JRadioButton;
+import javax.swing.SwingConstants;
+import javax.swing.ButtonGroup;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.border.TitledBorder;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.ScrollPane;
+import javax.swing.JTextArea;
+
+@SuppressWarnings("serial")
+public class MainMenue_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnImageNew;
+	JRadioButton rdbtnImageEdit;
+	JRadioButton rdbtnImageSearchDownload;
+	JRadioButton rdbtnVeranstaltungNew;
+	private final ButtonGroup buttonGroup = new ButtonGroup();
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			MainMenue_GUI dialog = new MainMenue_GUI();
+			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public MainMenue_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		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 - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 545, 366);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 567, 69);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Hauptmen\u00FC");
+				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("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 104, 567, 502);
+		contentPanel.setBackground(SystemColor.menu);
+		
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panelImage = new JPanel();
+		panelImage.setBackground(SystemColor.menu);
+		panelImage.setBorder(new TitledBorder(null, "VL-Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panelImage.setBounds(10, 86, 270, 200);
+		contentPanel.add(panelImage);
+		panelImage.setLayout(null);
+		
+		rdbtnImageNew = new JRadioButton("Neu");
+		rdbtnImageNew.setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden");
+		rdbtnImageNew.setBounds(6, 22, 159, 23);
+		panelImage.add(rdbtnImageNew);
+		rdbtnImageNew.setSelected(true);
+		buttonGroup.add(rdbtnImageNew);
+		rdbtnImageNew.setBackground(SystemColor.menu);
+		
+		
+		
+		rdbtnImageEdit = new JRadioButton("Bearbeiten");
+		rdbtnImageEdit.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
+		rdbtnImageEdit.setBounds(6, 48, 185, 23);
+		panelImage.add(rdbtnImageEdit);
+		buttonGroup.add(rdbtnImageEdit);
+		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);
+		rdbtnImageEdit.setBackground(SystemColor.menu);
+		
+		JRadioButton rdbtnImageDelete = new JRadioButton("L\u00F6schen");
+		buttonGroup.add(rdbtnImageDelete);
+		rdbtnImageDelete.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
+		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);
+		rdbtnImageDelete.setBackground(SystemColor.menu);
+		rdbtnImageDelete.setBounds(6, 74, 185, 23);
+		panelImage.add(rdbtnImageDelete);
+		
+		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);
+		rdbtnImageSearchDownload.setBackground(SystemColor.menu);
+		rdbtnImageSearchDownload.setBounds(6, 100, 185, 23);
+		panelImage.add(rdbtnImageSearchDownload);
+		
+		JPanel panelDesc = new JPanel();
+		panelDesc.setLayout(null);
+		panelDesc.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Erklärung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panelDesc.setBackground(SystemColor.menu);
+		panelDesc.setBounds(290, 86, 270, 200);
+		contentPanel.add(panelDesc);
+		
+		ScrollPane scrollPaneDesc = new ScrollPane();
+		scrollPaneDesc.setBounds(5, 15, 260, 180);
+		JTextArea txtDesc=new JTextArea();
+		txtDesc.setBackground(SystemColor.menu);
+		txtDesc.setWrapStyleWord(true);
+		txtDesc.setLineWrap(true);
+		scrollPaneDesc.add(txtDesc);
+		//Pro AUswahl
+		txtDesc.setText("Hier steht irgendwann die Beschreibung der einzelnen Punkte\r\n");
+		panelDesc.add(scrollPaneDesc);
+		
+		JPanel panelVeranstaltung = new JPanel();
+		panelVeranstaltung.setLayout(null);
+		panelVeranstaltung.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panelVeranstaltung.setBackground(SystemColor.menu);
+		panelVeranstaltung.setBounds(10, 297, 270, 200);
+		contentPanel.add(panelVeranstaltung);
+		
+		rdbtnVeranstaltungNew = new JRadioButton("Neu");
+		buttonGroup.add(rdbtnVeranstaltungNew);
+		rdbtnVeranstaltungNew.setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben");
+		rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23);
+		panelVeranstaltung.add(rdbtnVeranstaltungNew);
+		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);
+		
+		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");
+		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");
+		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);
+		panelVeranstaltung.add(rdbtnVeranstaltungEdit);
+		buttonGroup.add(rdbtnVeranstaltungEdit);
+		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);
+		
+		JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen");
+		rdbtnVeranstaltungDelete.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
+		rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23);
+		panelVeranstaltung.add(rdbtnVeranstaltungDelete);
+		buttonGroup.add(rdbtnVeranstaltungDelete);
+		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);
+		
+		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");
+		buttonGroup.add(rdbtnVeranstaltungSearch);
+		rdbtnVeranstaltungSearch.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
+		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);
+		rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23);
+		panelVeranstaltung.add(rdbtnVeranstaltungSearch);
+		
+		JLabel lblCrumbStart = new JLabel("Startseite");
+		lblCrumbStart.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				Login_GUI lw=new Login_GUI();
+				lw.setVisible(true);
+				MainMenue_GUI.this.setVisible(false);
+			}
+		});
+		lblCrumbStart.setForeground(Color.BLUE);
+		lblCrumbStart.setBounds(10, 0, 52, 14);
+		contentPanel.add(lblCrumbStart);
+		
+		JLabel label = new JLabel(">");
+		label.setBounds(60, 0, 13, 14);
+		contentPanel.add(label);
+		
+		JLabel lblRechtshinweis = new JLabel("Rechtshinweis");
+		lblRechtshinweis.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				BillOfRights_GUI rb=new BillOfRights_GUI();
+				rb.setVisible(true);
+				MainMenue_GUI.this.setVisible(false);
+			}
+		});
+		lblRechtshinweis.setForeground(Color.BLUE);
+		lblRechtshinweis.setBounds(72, 0, 68, 14);
+		contentPanel.add(lblRechtshinweis);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(142, 0, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
+		lblNewLabel_1.setBounds(150, 0, 74, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JLabel lblNewLabel_2 = new JLabel("*Platzhalter Bild*");
+		lblNewLabel_2.setBounds(10, 25, 557, 59);
+		contentPanel.add(lblNewLabel_2);
+		
+		JPanel panelNews = new JPanel();
+		panelNews.setLayout(null);
+		panelNews.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "News", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panelNews.setBackground(SystemColor.menu);
+		panelNews.setBounds(290, 297, 270, 200);
+		contentPanel.add(panelNews);
+		
+		ScrollPane scrollPaneNews = new ScrollPane();
+		scrollPaneNews.setBounds(5, 15, 260, 180);
+		JTextArea txtNews=new JTextArea();
+		txtNews.setBackground(SystemColor.menu);
+		txtNews.setWrapStyleWord(true);
+		txtNews.setLineWrap(true);
+		txtNews.setText("Hier werden mal die Neuigkeiten stehen");
+		scrollPaneNews.add(txtNews);
+		panelNews.add(scrollPaneNews);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 630, 587, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						if(rdbtnImageNew.isSelected()==true)
+						{
+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
+						sr.setVisible(true);
+						dispose();
+						} else if(rdbtnImageEdit.isSelected()==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();
+						}else if(rdbtnVeranstaltungNew.isSelected()==true)
+						{
+							EingabeVeranstaltungAllgemein_GUI av=new EingabeVeranstaltungAllgemein_GUI();
+							av.setVisible(true);
+							dispose();
+						}
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 617, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 91, 587, 2);
+			getContentPane().add(separator);
+		}
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		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/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java
new file mode 100644
index 00000000..44b83087
--- /dev/null
+++ b/Dozentenmodul/src/gui/SearchImage_GUI.java
@@ -0,0 +1,420 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.DefaultTableModel;
+
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import thrift.ThriftConnection;
+
+@SuppressWarnings("serial")
+public class SearchImage_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	JComboBox<String> comboBox;
+	JTable tableAllImages;
+	private JTextField textFieldName;
+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
+    ThriftConnection con=new ThriftConnection();
+    Client client=con.getThriftConnection();
+    
+	/**
+	 * 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);
+		
+
+		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
+		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
+		
+		
+		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.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				String stext=textFieldName.getText();
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				
+				if(stext!="")
+				for(int i=0;i<modelAll.getRowCount();i++){
+					
+					if(modelAll.getValueAt(i, 0).toString().startsWith(stext)){
+						
+					}
+					else
+					{
+						modelAll.removeRow(i);
+					}
+				}					
+			}					
+		});
+
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+		
+		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);
+		
+		comboBox = new JComboBox<String>();
+		try {
+			List<String> list=client.getAllOS();
+			comboBox.addItem("");
+			for(int i=0;i<list.size();i++)
+			{
+			comboBox.addItem(list.get(i));
+			}
+		} catch (TException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				modelAll.setRowCount(0);
+				initTableModel(modelAll);
+				String selItem=comboBox.getSelectedItem().toString();
+				if(selItem!="")
+				{
+				for(int i=0;i<modelAll.getRowCount();i++){
+					
+					if(modelAll.getValueAt(i, 2).equals(selItem)){
+						
+					}
+					else
+					{
+						modelAll.removeRow(i);
+					}
+				}							
+			}
+			}
+		});
+		comboBox.setBounds(270, 58, 250, 20);
+		panel_1.add(comboBox);
+		
+		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(model);
+		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();
+		
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		tableAllImages=new JTable();
+		tableAllImages.setModel(modelAll);
+		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);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+		
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+		JTable tableCoopImages=new JTable();
+		tableCoopImages.setModel(model);
+		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(model);
+		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(model);
+		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);
+		
+		initTableModel(modelAll);
+		
+		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(449, 508, 118, 23);
+		contentPanel.add(btnDownload);
+		{
+			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 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);
+		
+	}
+	
+	public DefaultTableModel initTableModel(DefaultTableModel model){
+		List<server.Image> images;
+		try {
+			images = client.getImageList();
+			Iterator<server.Image> i=images.iterator();
+			List<Object[]> ListObj = new ArrayList<Object[]>();
+			int x=0;
+			
+			while(i.hasNext())
+			{
+				
+				i.next();
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUpdateTime(),images.get(x).getUserData()};
+				ListObj.add(obj);
+				model.addRow(ListObj.get(x));
+				x++;
+				
+			}
+			
+			return model;
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		return model;
+	}
+	
+	}
+
+
diff --git a/Dozentenmodul/src/gui/SearchMethod_GUI.java b/Dozentenmodul/src/gui/SearchMethod_GUI.java
new file mode 100644
index 00000000..24a12959
--- /dev/null
+++ b/Dozentenmodul/src/gui/SearchMethod_GUI.java
@@ -0,0 +1,243 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+
+@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/VmWareLink_GUI.java b/Dozentenmodul/src/gui/VmWareLink_GUI.java
new file mode 100644
index 00000000..b803ee44
--- /dev/null
+++ b/Dozentenmodul/src/gui/VmWareLink_GUI.java
@@ -0,0 +1,190 @@
+package gui;
+
+import java.awt.Desktop;
+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 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 java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.JCheckBox;
+
+
+@SuppressWarnings("serial")
+public class VmWareLink_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			VmWareLink_GUI dialog = new VmWareLink_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public VmWareLink_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				System.exit(0);
+			}
+		});
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("Dozentenmodul *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBounds(0, 0, 577, 80);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Hinweis VMWare Player");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 104, 567, 502);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JTextPane txtpnUmIhreVmdk = new JTextPane();
+		txtpnUmIhreVmdk.setBackground(SystemColor.menu);
+		txtpnUmIhreVmdk.setEditable(false);
+		txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden.");
+		txtpnUmIhreVmdk.setBounds(10, 16, 499, 66);
+		contentPanel.add(txtpnUmIhreVmdk);
+		
+		JLabel lblNewLabel_1 = new JLabel("<html><b>Windows: </b></html>");
+		lblNewLabel_1.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseReleased(MouseEvent arg0) {
+				URI url;
+				try {
+					url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0");
+					Desktop.getDesktop().browse(url);
+				} catch (URISyntaxException | IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}
+		});
+	
+		lblNewLabel_1.setBounds(10, 93, 499, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JCheckBox chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
+		chckbxNewCheckBox.setBounds(6, 472, 555, 23);
+		contentPanel.add(chckbxNewCheckBox);
+		
+		JLabel lbllinuxvmwarePlayer = new JLabel("<html><b>Linux:    </b></html>");
+		lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14);
+		contentPanel.add(lbllinuxvmwarePlayer);
+		
+		JLabel lblvmwarePlayerDownload = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
+		lblvmwarePlayerDownload.setBounds(10, 118, 499, 14);
+		contentPanel.add(lblvmwarePlayerDownload);
+		
+		JLabel lblvmwarePlayerDownload_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
+		lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14);
+		contentPanel.add(lblvmwarePlayerDownload_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 630, 587, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						MainMenue_GUI ea=new MainMenue_GUI();
+						ea.setVisible(true);
+						dispose();
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 617, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 91, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JMenuBar menuBar = new JMenuBar();
+			setJMenuBar(menuBar);
+			{
+				JMenu mnHilfe = new JMenu("Hilfe");
+				menuBar.add(mnHilfe);
+				{
+					JMenuItem mntmFaq = new JMenuItem("FAQ");
+					mnHilfe.add(mntmFaq);
+				}
+				{
+					JMenuItem mntmHilfe = new JMenuItem("Hilfe");
+					mnHilfe.add(mntmHilfe);
+				}
+			}
+		}
+		
+		
+
+	}
+}
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
new file mode 100644
index 00000000..f16a7594
--- /dev/null
+++ b/Dozentenmodul/src/models/Image.java
@@ -0,0 +1,43 @@
+package models;
+
+public class Image {
+	private String imagename;
+	private boolean licensed;
+	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) {
+		this.imagename = imagename;
+	}
+	public boolean isLicensed() {
+		return licensed;
+	}
+	public void setLicensed(boolean licensed) {
+		this.licensed = licensed;
+	}
+	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/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java
new file mode 100644
index 00000000..383bded9
--- /dev/null
+++ b/Dozentenmodul/src/models/Lecture.java
@@ -0,0 +1,66 @@
+package models;
+
+import java.util.Date;
+
+public class Lecture {
+
+	
+	private String name;
+	private String shortDesc;
+	private String desc;
+	private Date startdate;
+	private Date enddate;
+	private boolean active;
+	
+	public static Lecture lecture =new Lecture();
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getShortDesc() {
+		return shortDesc;
+	}
+
+	public void setShortDesc(String shortDesc) {
+		this.shortDesc = shortDesc;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public Date getStartdate() {
+		return startdate;
+	}
+
+	public void setStartdate(Date startdate) {
+		this.startdate = startdate;
+	}
+
+	public Date getEnddate() {
+		return enddate;
+	}
+
+	public void setEnddate(Date enddate) {
+		this.enddate = enddate;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+	
+	
+}
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
new file mode 100644
index 00000000..f4dd5c22
--- /dev/null
+++ b/Dozentenmodul/src/models/person.java
@@ -0,0 +1,62 @@
+package models;
+
+
+public class person{
+
+	private String Name;
+	private String Vorname;
+	private String Hochschule;
+	private String EMail;
+	private String Tel;
+	private String Fakultät;
+	private boolean ischecked;
+	
+	
+	public static person verantowrtlicher=new person();
+	public static person ersteller=new person();
+	
+	public String getName() {
+		return Name;
+	}
+	public void setName(String name) {
+		Name = name;
+	}
+	public String getVorname() {
+		return Vorname;
+	}
+	public void setVorname(String vorname) {
+		Vorname = vorname;
+	}
+	public String getHochschule() {
+		return Hochschule;
+	}
+	public void setHochschule(String hochschule) {
+		Hochschule = hochschule;
+	}
+	public String getEMail() {
+		return EMail;
+	}
+	public void setEMail(String eMail) {
+		EMail = eMail;
+	}
+	public String getTel() {
+		return Tel;
+	}
+	public void setTel(String tel) {
+		Tel = tel;
+	}
+	public String getFakultät() {
+		return Fakultät;
+	}
+	public void setFakultät(String fakultät) {
+		Fakultät = fakultät;
+	}
+	public boolean isIschecked() {
+		return ischecked;
+	}
+	public void setIschecked(boolean ischecked) {
+		this.ischecked = ischecked;
+	}
+
+
+}
diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java
new file mode 100644
index 00000000..be64937f
--- /dev/null
+++ b/Dozentenmodul/src/models/user.java
@@ -0,0 +1,22 @@
+package models;
+
+public class user {
+	
+	private String userName;
+	private String Password;
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getPassword() {
+		return Password;
+	}
+	public void setPassword(String password) {
+		Password = password;
+	}
+	
+	
+
+}
diff --git a/Dozentenmodul/src/models/vm.java b/Dozentenmodul/src/models/vm.java
new file mode 100644
index 00000000..34f9ffaa
--- /dev/null
+++ b/Dozentenmodul/src/models/vm.java
@@ -0,0 +1,69 @@
+package models;
+
+import java.awt.List;
+import java.util.Date;
+
+
+public class vm {
+
+	private String Laborname;
+	private String shortDesc;
+	private String longDesc;
+	private String comment;
+	private String OS;
+	private Date begin;
+	private Date end;
+	private List software;
+	
+	public static vm vl=new vm();
+	public String getLaborname() {
+		return Laborname;
+	}
+	public void setLaborname(String laborname) {
+		Laborname = laborname;
+	}
+	public String getShortDesc() {
+		return shortDesc;
+	}
+	public void setShortDesc(String shortDesc) {
+		this.shortDesc = shortDesc;
+	}
+	public String getLongDesc() {
+		return longDesc;
+	}
+	public void setLongDesc(String longDesc) {
+		this.longDesc = longDesc;
+	}
+	public String getComment() {
+		return comment;
+	}
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+	public String getOS() {
+		return OS;
+	}
+	public void setOS(String oS) {
+		OS = oS;
+	}
+	public Date getBegin() {
+		return begin;
+	}
+	public void setBegin(Date begin) {
+		this.begin = begin;
+	}
+	public Date getEnd() {
+		return end;
+	}
+	public void setEnd(Date end) {
+		this.end = end;
+	}
+	public List getSoftware() {
+		return software;
+	}
+	public void setSoftware(List software) {
+		this.software = software;
+	}
+	
+	
+}
diff --git a/Dozentenmodul/src/rmi/RmiClientMethods.java b/Dozentenmodul/src/rmi/RmiClientMethods.java
deleted file mode 100644
index 58df1734..00000000
--- a/Dozentenmodul/src/rmi/RmiClientMethods.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package rmi;
-import java.rmi.*;
-import server.*;
-
-public class RmiClientMethods {
-	
-	public ServerInterface getInterface()
-	{
-        String strName = "rmi://141.79.128.121:9999/TheRMIExample";
-        System.out.println("Client: Looking up " + strName + "...");
-        ServerInterface RMI = null;
-
-        try
-        {
-        	
-            RMI = (ServerInterface)Naming.lookup(strName);
-            
-        }
-        catch (Exception e)
-        {
-        System.out.println("Client: Exception thrown looking up " + strName);
-        System.out.println("Client: " + e.getMessage().toString());
-        System.exit(1);
-        }
-		return RMI;
-	}
-
-        
-}
diff --git a/Dozentenmodul/src/sql/sql.java b/Dozentenmodul/src/sql/sql.java
deleted file mode 100644
index c7252049..00000000
--- a/Dozentenmodul/src/sql/sql.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package sql;

-import java.sql.Connection;

-import java.sql.DriverManager;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import java.sql.Statement;

-

-

-

-

-public class sql {

-

-	//Erstellt eine Verbindung zu einer Datenbank

-	public Connection getConnection()

-	{

-		try {

-			Class.forName("com.mysql.jdbc.Driver").newInstance();

-		} catch (InstantiationException | IllegalAccessException

-				| ClassNotFoundException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		try {

-			Connection con=DriverManager.getConnection("jdbc:mysql://132.230.4.16/bwLehrpool?user=bwlpuser&password=armag3ddon");

-			con.setAutoCommit(false);

-			return con;

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		return null;		

-	}

-	

-	//Liefert alle vorhandenen Betriebssysteme zurück

-	public ResultSet getAllOS(Connection con)

-	{

-		Statement stm;

-		try {

-			stm = con.createStatement();

-			return stm.executeQuery("SELECT distinct Produktname, Version, Architektur FROM bwLehrpool.Betriebssystem order by Produktname asc;");

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		return null;

-	}

-	

-	//Fügt ein Betriebssystem in die Datenbank ein

-	public int AddOS(Connection con, String name, String Version, String Architektur,int Kosten, String Hersteller)

-	{

-		Statement stm;

-		try {

-			stm=con.createStatement();

-			

-			int pk_Hersteller=HerstellerExists(con, Hersteller);

-

-			if(pk_Hersteller==-1)

-			{

-				addHersteller(con, Hersteller);

-				pk_Hersteller=HerstellerExists(con, Hersteller);

-			}		

-			

-			int ret=stm.executeUpdate("INSERT INTO `bwLehrpool`.`Betriebssystem`(`Produktname`,`Version`,`Architektur`,`IstKostenlos`,`SWHersteller_pk`)VALUES('"+name+"','"+Version+"','"+Architektur+"',"+Kosten+","+pk_Hersteller+");");

-			con.commit();

-			return ret;

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		return -1;

-		

-	}

-	

-	//Überprüft ob der angegebene Hersteller bereits exisitert

-	public int HerstellerExists(Connection con, String Hersteller)

-	{

-		int pk_Hersteller=-1;		

-			try {				

-				ResultSet rs=getAllHersteller(con);				

-				while(rs.next())

-				{

-					if(rs.getString("Name").equals(Hersteller))

-					{

-						pk_Hersteller=Integer.parseInt(rs.getString("pk"));

-					}

-				}

-			} catch (SQLException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}			

-			return pk_Hersteller;	

-	}

-	

-	//Liefert alle vorhandenen Hersteller zurück

-	public ResultSet getAllHersteller(Connection con)

-	{

-		try {

-			Statement stm=con.createStatement();

-			return stm.executeQuery("SELECT pk,Name FROM bwLehrpool.SWHersteller order by Name asc;");			

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}		

-		return null;

-	}

-	//Fügt einen Hersteller in die Datenbank ein

-	public int addHersteller(Connection con, String Name){		

-		Statement stm;

-		int ret=-1;

-		try {

-			stm=con.createStatement();

-			ret=stm.executeUpdate("INSERT INTO `bwLehrpool`.`SWHersteller`(`Name`)VALUES('"+Name+"');");

-			con.commit();

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			

-			e.printStackTrace();

-		}

-		return ret;		

-	}

-	

-	//Liefert sämtliche in der Datenbank vorhandene Software zurück

-	public ResultSet getAllSoftware(Connection con, String Hersteller)

-	{

-		

-		try {

-			Statement stm=con.createStatement();

-			

-			return stm.executeQuery("SELECT s.pk,s.Produktname, s.Version, s.Architektur FROM bwLehrpool.Software s left join bwLehrpool.SWHersteller h on s.SWHersteller_pk=h.pk where Name like '"+Hersteller+"' order by s.Produktname;");

-			

-			

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		

-		return null;

-		

-	}

-	

-	//Gibt die Software abhängig vom gesuchten Namen zurück

-	public ResultSet getSoftwareByName(Connection con, String Name)

-	{

-		

-		try {

-			Statement stm=con.createStatement();

-			

-			return stm.executeQuery("SELECT concat(h.Name,' ',s.Produktname,' ',s.Version,' ',s.Architektur) as SW FROM bwLehrpool.Software s left join bwLehrpool.SWHersteller h on s.SWHersteller_pk=h.pk where concat(h.Name,' ',s.Produktname,' ',s.Version,' ',s.Architektur) like '%"+Name+"%' order by s.Produktname;");

-			

-			

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		

-		

-		return null;

-		

-	}

-	

-	//Fügt eine Software in die Datenbank ein

-	public int AddSoftware(Connection con, String name, String Version, String Architektur,int Kosten, String Hersteller)

-	{

-		Statement stm;

-		try {

-			stm=con.createStatement();

-			

-			int pk_Hersteller=HerstellerExists(con, Hersteller);

-

-			if(pk_Hersteller==-1)

-			{

-

-				addHersteller(con, Hersteller);

-				pk_Hersteller=HerstellerExists(con, Hersteller);

-

-			}			

-			int ret=stm.executeUpdate("INSERT INTO `bwLehrpool`.`Software`(`Produktname`,`Version`,`Architektur`,`IstKostenlos`,`SWHersteller_pk`)VALUES('"+name+"','"+Version+"','"+Architektur+"',"+Kosten+","+pk_Hersteller+");");

-			con.commit();

-			return ret;

-		} catch (SQLException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		return -1;

-		

-	}

-

-}

diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java
new file mode 100644
index 00000000..6a65c948
--- /dev/null
+++ b/Dozentenmodul/src/thrift/ThriftConnection.java
@@ -0,0 +1,32 @@
+package thrift;
+
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+import server.Server;
+import server.Server.Client;
+
+public class ThriftConnection {
+
+	public Client getThriftConnection()
+	{
+		final TTransport transport = new TSocket("141.79.128.121", 9090);
+		try {
+			transport.open();
+		} catch (TTransportException e) {
+			System.out.println("Keine Verbindung zum Master möglich!");
+			return null;
+		}
+
+		final TProtocol protocol = new TBinaryProtocol(transport);
+		final Server.Client client = new Server.Client(protocol);
+
+		
+		System.out.println("Der Zentralserver läuft!");
+		return client;
+	}
+
+}