Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	ffffDozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class
	Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class
	Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
	Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class
	Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
	Dozentenmodul/src/models/Links.java

82 files changed, 748 insertions, 310 deletions

diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class
index 59b34fab..6a1603c3 100644
--- a/Dozentenmodul/bin/Models/Image.class
+++ b/Dozentenmodul/bin/Models/Image.class
diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class
index a0cb753d..31755bcf 100644
--- a/Dozentenmodul/bin/Models/Lecture.class
+++ b/Dozentenmodul/bin/Models/Lecture.class
diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class
index 36fa9761..ef2a89eb 100644
--- a/Dozentenmodul/bin/Models/person.class
+++ b/Dozentenmodul/bin/Models/person.class
diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class
index 1d67fe3e..519d3b0f 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class
index 9fc35b48..2283207b 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class
index 4aedd907..722ecdf2 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class
index 2c9cd712..087cc45a 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class
index 77c79351..93e19bd4 100644
--- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class
+++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class
index 353bafa4..f591fa7e 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class
index 23d60d2f..14f49298 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class
index 03680a6f..65f6eba8 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
index 21e46d35..5aa7bc75 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
index 214beaa8..225b1b06 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
index 04c8b107..ef0dedf1 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
index a846427a..3e960f4f 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class
index 885bcd1e..fdf5b938 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class
index 58a8dce5..f0f619ac 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class
deleted file mode 100644
index 81f1d246..00000000
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class
deleted file mode 100644
index 61318fe0..00000000
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class
index 4400254b..aebbf028 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class
index eca0e58d..d599dabe 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class
index c98d437a..9949e5fe 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class
index 46b870e2..41208104 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class
index 6c550b56..33cf65cb 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class
index 0908c65a..b74a9bf2 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class
index 033c3dda..88c5fdfe 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class
index 245edb20..b55da9f2 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 91b73e2a..15cb2ba1 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class
index be8f1a48..799a2aab 100644
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class
deleted file mode 100644
index 0527987f..00000000
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class
deleted file mode 100644
index a1ae48ca..00000000
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class
deleted file mode 100644
index 1a30bb2e..00000000
--- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class
index 12d4c61f..3577fd18 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class
index 51b3d910..db82c341 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class
index ceea662a..49b37d40 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class
index 67922a25..aeea08eb 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class
index 11cda571..8446b2d1 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class
index 0759ddca..60c57e03 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class
index 0c7b67a0..6a5bcf01 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class
index 09461d3a..4a021966 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
index 59b84bd3..c9f61e8d 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
index ddd0274d..75c03435 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class
index 194553e1..6d2d2df7 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class
index beea9e15..51e86415 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
index 764ffbee..c5d4f8cf 100644
--- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class
diff --git a/Dozentenmodul/bin/models/Image.class b/Dozentenmodul/bin/models/Image.class
index 59b34fab..6a1603c3 100644
--- a/Dozentenmodul/bin/models/Image.class
+++ b/Dozentenmodul/bin/models/Image.class
diff --git a/Dozentenmodul/bin/models/Lecture.class b/Dozentenmodul/bin/models/Lecture.class
index a0cb753d..31755bcf 100644
--- a/Dozentenmodul/bin/models/Lecture.class
+++ b/Dozentenmodul/bin/models/Lecture.class
diff --git a/Dozentenmodul/bin/models/person.class b/Dozentenmodul/bin/models/person.class
index 36fa9761..ef2a89eb 100644
--- a/Dozentenmodul/bin/models/person.class
+++ b/Dozentenmodul/bin/models/person.class
diff --git a/Dozentenmodul/bin/models/user.class b/Dozentenmodul/bin/models/user.class
index af67dd13..cd274e48 100644
--- a/Dozentenmodul/bin/models/user.class
+++ b/Dozentenmodul/bin/models/user.class
diff --git a/Dozentenmodul/bin/thrift/MasterThriftConnection.class b/Dozentenmodul/bin/thrift/MasterThriftConnection.class
index 9b587dd3..8229138f 100644
--- a/Dozentenmodul/bin/thrift/MasterThriftConnection.class
+++ b/Dozentenmodul/bin/thrift/MasterThriftConnection.class
diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index 0b3c936e..89df5cd5 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,21 +1,28 @@
 package models;
 
 public class Image {
+	
 	private String ImageId;
 	private String version;
-
 	private String imagename;
 	private String newName;
 	private String imagepath;
+	private int shareMode;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
 	private int cpu;
 	private long filesize;
-	
 	public static Image image =new Image();
 	
 	
+	
+	public int getShareMode() {
+		return shareMode;
+	}
+	public void setShareMode(int shareMode) {
+		this.shareMode = shareMode;
+	}
 	public String getImagepath() {
 		return imagepath;
 	}
diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java
index 6b7e6fa1..eae05ec5 100644
--- a/Dozentenmodul/src/Models/Lecture.java
+++ b/Dozentenmodul/src/Models/Lecture.java
@@ -4,7 +4,6 @@ import java.util.Date;
 
 public class Lecture {
 
-	
 	private String name;
 	private String newName;
 	private String shortDesc;
@@ -14,8 +13,6 @@ public class Lecture {
 	private boolean active;
 	private String id;
 	private String linkedImagename;
-	
-	
 	public static Lecture lecture =new Lecture();
 	
 
diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -3,9 +3,7 @@ package models;
 
 public class person{
 
-
 	private String username;
-
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
 	private String Tel;
 	private String Fakultaet;
 	private boolean ischecked;
-
-	//public static person verantowrtlicher=new person();
 	public static person verantwortlicher=new person();
 	
-	
 	public String getUsername() {
 		return username;
 	}
diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
new file mode 100644
index 00000000..ce77282a
--- /dev/null
+++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java
@@ -0,0 +1,251 @@
+package gui.image;
+
+
+import gui.intro.MainMenue_GUI;
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+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 java.io.IOException;
+
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+
+import models.Image;
+import models.Links;
+import javax.swing.JComboBox;
+import javax.swing.DefaultComboBoxModel;
+
+@SuppressWarnings("serial")
+public class CreateImageFreigabe_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	JComboBox comboBox;
+
+	/**
+	 * Create the dialog.
+	 */
+	public CreateImageFreigabe_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* - Image erzeugen");
+		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("Image Freigabe");
+				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("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus.");
+			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, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 51, 557, 124);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Freigabemodus:");
+		lblNewLabel_2.setBounds(10, 55, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		comboBox = new JComboBox();
+		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "\u00D6ffentlich (Alle Hochschulen)"}));
+		comboBox.setSelectedIndex(0);
+		comboBox.setBounds(270, 55, 250, 20);
+		panel_1.add(comboBox);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				CreateImageFreigabe_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 cancelButton = new JButton("Zur\u00FCck");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						Image.image.setShareMode(comboBox.getSelectedIndex());
+						CreateImageTechnisch_GUI sr=new CreateImageTechnisch_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				cancelButton.setActionCommand("OK");
+				buttonPane.add(cancelButton);
+				//getRootPane().setDefaultButton(cancelButton);
+			}
+			{
+				JButton continueButton = new JButton("Weiter");
+				continueButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Image.image.setShareMode(comboBox.getSelectedIndex());
+						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				continueButton.setActionCommand("Cancel");
+				buttonPane.add(continueButton);
+				getRootPane().setDefaultButton(continueButton);
+			}
+		}
+		
+		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");
+		mntmFaq.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				
+				String faq;
+				
+				faq = Links.getFAQ();
+
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mntmOtrs.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				String otrs;
+				
+				otrs = Links.getOTRS();
+				
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+				} catch (IOException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
+
+			}
+		});
+
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 64023706..4e53b2d5 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -8,7 +8,6 @@ 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;
@@ -53,18 +52,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	JRadioButton rdbtnInternetNein;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
@@ -327,7 +315,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						}
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
 						ea.setVisible(true);
 						dispose();
 						
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index fa1f991c..21147e56 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -25,7 +25,6 @@ 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;
@@ -50,11 +49,9 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 import javax.swing.ListSelectionModel;
@@ -75,27 +72,22 @@ public class DeleteImage_GUI extends JFrame {
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection con=new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles,0){
+	      public boolean isCellEditable(int rowIndex, int mColIndex) {
+	        return false;
+	      }
+	    };
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
 			modelMyImages);
 
 	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			DeleteImage_GUI dialog = new DeleteImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
 	 * Create the dialog.
 	 */
 	public DeleteImage_GUI() {
@@ -109,7 +101,7 @@ public class DeleteImage_GUI extends JFrame {
 		});
 		// Verhindert das Vergroessern Des Fensters
 		setResizable(false);
-
+		
 		try {
 			// Setzt das Look & Feel auf System
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -199,7 +191,7 @@ public class DeleteImage_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche*Folgt noch...*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
@@ -209,13 +201,13 @@ public class DeleteImage_GUI extends JFrame {
 
 				// oeffnet das Fenster Extended GUI
 
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(332, 106, 188, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		comboBox = new JComboBox<String>();
@@ -324,7 +316,10 @@ public class DeleteImage_GUI extends JFrame {
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
 		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		tablemyImages.setEnabled(true);
+		
 		tablemyImages.setModel(modelMyImages);
+		
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
@@ -585,6 +580,7 @@ public class DeleteImage_GUI extends JFrame {
 						images.get(x).getVersion() };
 				// System.out.println("id:"+images.get(x).getId());
 				// F\u00FCge diese Objekte der Tabelle hinzu
+				
 				model.addRow(obj);
 				x++;
 				i.next();
diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
index f540e9ec..fe89746c 100644
--- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java
@@ -370,6 +370,17 @@ public class EditImageAllgemein_GUI extends JFrame {
 			Image.image.setImagename(map.get("name"));
 			Image.image.setRam(Integer.parseInt(map.get("ram")));
 			Image.image.setCpu(Integer.parseInt(map.get("cpu")));
+			Image.image.setImagepath(map.get("path"));
+			Image.image.setFilesize(Long.parseLong(map.get("filesize")));
+			int mode=0;
+			if(map.get("shareMode").equals("only_local")){
+				mode=0;
+			}
+			else
+			{
+				mode=1;
+			}
+			Image.image.setShareMode(mode);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
new file mode 100644
index 00000000..0f54c346
--- /dev/null
+++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java
@@ -0,0 +1,251 @@
+package gui.image;
+
+
+import gui.intro.MainMenue_GUI;
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+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 java.io.IOException;
+
+import javax.swing.JRadioButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+
+import models.Image;
+import models.Links;
+import javax.swing.JComboBox;
+import javax.swing.DefaultComboBoxModel;
+
+@SuppressWarnings("serial")
+public class EditImageFreigabe_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
+	JComboBox comboBox;
+
+	/**
+	 * Create the dialog.
+	 */
+	public EditImageFreigabe_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* - Image erzeugen");
+		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("Image Freigabe");
+				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("W\u00E4hlen Sie bitte hier die von Ihnen gew\u00FCnschte Freigabe f\u00FCr Ihr Image aus.");
+			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, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 51, 557, 124);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Freigabemodus:");
+		lblNewLabel_2.setBounds(10, 55, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		comboBox = new JComboBox();
+		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "\u00D6ffentlich (Alle Hochschulen)"}));
+		comboBox.setSelectedIndex(Image.image.getShareMode());
+		comboBox.setBounds(270, 55, 250, 20);
+		panel_1.add(comboBox);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				
+				EditImageFreigabe_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 cancelButton = new JButton("Zur\u00FCck");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						
+						Image.image.setShareMode(comboBox.getSelectedIndex());
+						EditImageTechnisch_GUI sr=new EditImageTechnisch_GUI();
+						sr.setVisible(true);
+						dispose();
+					}
+				});
+				cancelButton.setActionCommand("OK");
+				buttonPane.add(cancelButton);
+				//getRootPane().setDefaultButton(cancelButton);
+			}
+			{
+				JButton continueButton = new JButton("Weiter");
+				continueButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Image.image.setShareMode(comboBox.getSelectedIndex());
+						FTPEditUploader_GUI ea=new FTPEditUploader_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				continueButton.setActionCommand("Cancel");
+				buttonPane.add(continueButton);
+				getRootPane().setDefaultButton(continueButton);
+			}
+		}
+		
+		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");
+		mntmFaq.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				
+				String faq;
+				
+				faq = Links.getFAQ();
+
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mntmOtrs.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent arg0) {
+				String otrs;
+				
+				otrs = Links.getOTRS();
+				
+				try {
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs );
+				} catch (IOException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
+
+			}
+		});
+
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+}
diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index fa806cb6..f0d7dacb 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -318,7 +318,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 							Image.image.setLicensed(false);
 						}
 						// oeffnet das naechste Fenster
-						FTPEditUploader_GUI ea = new FTPEditUploader_GUI();
+						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
 						ea.setVisible(true);
 						dispose();
 
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 544f7b93..6118d1ac 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 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;
@@ -41,7 +40,6 @@ import models.person;
 import org.apache.thrift.TException;
 import server.Server.Client;
 import thrift.ThriftConnection;
-//import util.XMLCreator;
 import ftp.UploadTask;
 import gui.intro.MainMenue_GUI;
 import javax.swing.JMenuItem;
@@ -80,22 +78,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JButton btnZurck = new JButton("Zur\u00FCck");
 	int progress = 0; // progress of upload
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPCreateUploader_GUI frame = new FTPCreateUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
+	
 	/**
 	 * Create the frame.
 	 */
@@ -512,7 +495,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					person.verantwortlicher.getFakultaet(),
 					Image.image.isLicensed(), Image.image.isInternet(),
 					Image.image.getRam(), Image.image.getCpu(),
-					"temp/" + Image.image.getNewName(),false,Image.image.getFilesize());
+					"temp/" + Image.image.getNewName(),false,Image.image.getFilesize(),Image.image.getShareMode());
 			client.startFileCopy(Image.image.getNewName());
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index cc1c297a..96826596 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -374,7 +374,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		try {
 			user = client.getFtpUser();
 
-			downloadFile = client.getPathOfImage(Image.image.getImageId(),
+			downloadFile = user.path+"/"+client.getPathOfImage(Image.image.getImageId(),
 					Image.image.getVersion());
 
 		} catch (TException e) {
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index c0c362f9..a5f64d90 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 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;
@@ -80,22 +79,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPEditUploader_GUI frame = new FTPEditUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
+	
 	/**
 	 * Create the frame.
 	 */
@@ -313,7 +297,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
 
-				finishButton.setEnabled(false);
+				//finishButton.setEnabled(false);
 				finishButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
@@ -425,7 +409,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			progressBar.setValue(progress);
 			
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (progress == 0 || progress == 100) {
+			if (progress == 100) {
 				// not uploading currently
 				btnZurck.setEnabled(true);
 			} else {
@@ -484,12 +468,24 @@ public class FTPEditUploader_GUI extends JFrame implements
 		try {
 			System.out.println("NewName="+Image.image.getNewName());
 			System.out.println("OldName="+Image.image.getImagename());
+			if(Image.image.getNewName().isEmpty()){
+				client.updateImageData(Image.image.getImagename(),
+						Image.image.getImagename(),Image.image.getImagepath(), Image.image.isLicensed(),
+						Image.image.isInternet(), Image.image.getRam(),
+						Image.image.getCpu(), Image.image.getImageId(),
+						Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
+				client.startFileCopy(Image.image.getNewName());
+			}
+			else{
+				
+			
 			client.updateImageData(Image.image.getImagename(),
 					Image.image.getImagename(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
 					Image.image.isInternet(), Image.image.getRam(),
 					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion(), false,Image.image.getFilesize());
+					Image.image.getVersion(), false,Image.image.getFilesize(),Image.image.getShareMode());
 			client.startFileCopy(Image.image.getNewName());
+			}
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 593f8e06..ae368310 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -65,14 +65,23 @@ public class SearchEditImage_GUI extends JFrame {
 	JComboBox<String> comboBox;
 	JTable tableAllImages;
 	JTable tablemyImages;
+	boolean activeSearch=false;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
@@ -93,6 +102,8 @@ public class SearchEditImage_GUI extends JFrame {
 
 			@Override
 			public void windowOpened(WindowEvent arg0) {
+				initTableModel(modelMyImages);
+				initTableModel(modelAll);
 				textFieldName.requestFocusInWindow();
 			}
 		});
@@ -170,14 +181,22 @@ public class SearchEditImage_GUI extends JFrame {
 				String stext = textFieldName.getText();
 
 				// Wenn Textfield nicht leer
-				if (stext != "") {
+				if (stext.isEmpty()==false) {
+					activeSearch=true;
 					// Filtere nach der Eingabe
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
-
-				}
+					}
+				else{
+						activeSearch=false;
+						String username = person.verantwortlicher.getName() + " "
+								+ person.verantwortlicher.getVorname();
+						rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+								username, 4));
+						rowSorterAll.setRowFilter(null);
+						}
 			}
 		});
 
@@ -186,19 +205,19 @@ public class SearchEditImage_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(365, 106, 155, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		comboBox = new JComboBox<String>();
@@ -222,13 +241,23 @@ public class SearchEditImage_GUI extends JFrame {
 		comboBox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString() != "") {
+				if (comboBox.getSelectedItem().toString().isEmpty()==false) {
 					// Filtert nach dem ausgewaehlten Betriebssystem
+					activeSearch=true;
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
 							.getSelectedItem().toString(), 2));
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
 				}
+				else{
+					activeSearch=false;
+					String username = person.verantwortlicher.getName() + " "
+							+ person.verantwortlicher.getVorname();
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+							username, 4));
+					
+					rowSorterAll.setRowFilter(null);
+				}
 			}
 
 		});
@@ -270,15 +299,15 @@ public class SearchEditImage_GUI extends JFrame {
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0) {
+				if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) {
 
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					// String username="Spitzer Tobias";
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							username, 4));
-				} else if (tabbedPane.getSelectedIndex() == 1) {
-
+				} else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){
+					rowSorterAll.setRowFilter(null);
 				}
 
 			}
@@ -286,7 +315,7 @@ public class SearchEditImage_GUI extends JFrame {
 
 		tabbedPane.setBounds(10, 197, 557, 300);
 		contentPanel.add(tabbedPane);
-		initTableModel(modelMyImages);
+		
 
 		JScrollPane scrollPaneAllImages = new JScrollPane();
 		tableAllImages = new JTable();
@@ -296,7 +325,7 @@ public class SearchEditImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		initTableModel(modelAll);
+		
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index d03a218d..59512570 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -48,10 +48,7 @@ import javax.swing.table.TableRowSorter;
 import models.Image;
 import models.Links;
 import models.person;
-//import models.person;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 
@@ -71,8 +68,16 @@ public class SearchImage_GUI extends JFrame {
 			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
@@ -186,19 +191,19 @@ public class SearchImage_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(360, 106, 160, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		comboBox = new JComboBox<String>();
diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
index 6ea3e1af..3d312394 100644
--- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
@@ -15,10 +15,8 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.IOException;
-
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -33,7 +31,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Links;
 
 @SuppressWarnings("serial")
@@ -45,18 +42,7 @@ public class SearchMethodLecture_GUI extends JFrame {
 	JRadioButton rdbtnSearchByLecture;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 34469617..5b4ecbd9 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -212,6 +212,7 @@ public class Login_GUI extends JFrame {
 				//set connection to bwLehrpoolSuiteServer
 				ThriftConnection bwthrift=new ThriftConnection();
 				server.Server.Client bwClient=bwthrift.getThriftConnection();
+				System.out.println("Connection zu Satellit aufgebaut!");
 				models.Client.clientcon.setClient(bwClient);
 				
 				
diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
index 607ccf17..59f47f4b 100644
--- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
@@ -7,7 +7,6 @@ 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;
@@ -34,9 +33,7 @@ import java.awt.event.WindowEvent;
 import javax.swing.JCheckBox;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeEvent;
-
 import models.Links;
-
 import org.ini4j.InvalidFileFormatException;
 import org.ini4j.Wini;
 
@@ -47,18 +44,8 @@ public class VmWareLink_GUI extends JFrame {
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JCheckBox chckbxNewCheckBox;
-	/**
-	 * 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();
-		}
-	}
+	private JButton btnWindows;
+	
 
 	/**
 	 * Create the dialog.
@@ -169,13 +156,36 @@ public class VmWareLink_GUI extends JFrame {
 		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);
+		btnWindows = new JButton("VMware Player herunterladen");
+		btnWindows.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				try {
+					 URI windows= new URI(Links.getUriWindows());
+					openWebpage(windows);
+				} catch (URISyntaxException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}
+		});
+		btnWindows.setBounds(10, 119, 186, 23);
+		contentPanel.add(btnWindows);
 		
-		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);
+		JButton btnLinux = new JButton("VMware Player herunterladen");
+		btnLinux.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				try {
+					 URI windows= new URI(Links.getUriLinux());
+					openWebpage(windows);
+				} catch (URISyntaxException f) {
+					// TODO Auto-generated catch block
+					f.printStackTrace();
+				}
+			}
+		});
+		btnLinux.setBounds(10, 203, 186, 23);
+		contentPanel.add(btnLinux);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 630, 587, 33);
@@ -242,5 +252,17 @@ public class VmWareLink_GUI extends JFrame {
 		
 		
 
-	}
-}
+	}//end constructor
+	
+	public static void openWebpage(URI uri) {
+	    Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
+	    if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
+	        try {
+	            desktop.browse(uri);
+	        } catch (Exception e) {
+	            e.printStackTrace();
+	        }
+	    }
+	}// end openWebpage
+
+}// end class
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
index b60d358b..0c115f69 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -15,7 +14,6 @@ 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;
@@ -39,7 +37,6 @@ import java.awt.ScrollPane;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
-
 import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 
@@ -65,18 +62,6 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 	boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect,
 			isAllInformationReady = false;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateLectureAllgemein_GUI dialog = new CreateLectureAllgemein_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index fd0fc33f..148e42fc 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -24,7 +23,6 @@ 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;
@@ -70,19 +68,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateLectureLink_GUI dialog = new CreateLectureLink_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index 7559cebe..5a3f24df 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -44,7 +43,6 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
@@ -78,19 +76,7 @@ public class DeleteLecture_GUI extends JFrame {
 			modelMyLectures);
 	private JButton button;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
@@ -190,19 +176,19 @@ public class DeleteLecture_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche*Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(336, 106, 184, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index 8c5fa5fb..7e171078 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -15,9 +15,7 @@ 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;
@@ -31,7 +29,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Image;
 import models.Lecture;
 import models.Links;
@@ -39,7 +36,6 @@ import models.person;
 import javax.swing.JTextArea;
 import java.awt.ScrollPane;
 import java.io.IOException;
-
 import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
@@ -61,18 +57,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 	JDateChooser dateChooserstart;
 	JRadioButton radioButtonno;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index eb5a3748..3c93b46f 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -23,7 +23,6 @@ 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;
@@ -69,19 +68,7 @@ public class EditLectureLink_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureLink_GUI dialog = new EditLectureLink_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
@@ -183,17 +170,17 @@ public class EditLectureLink_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(317, 106, 203, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		comboBox = new JComboBox<String>();
@@ -458,6 +445,18 @@ public class EditLectureLink_GUI extends JFrame {
 				
 				Links.openFAQ();
 				
+<<<<<<< HEAD
+=======
+				faq = Links.getFAQ();
+
+				try {
+				
+					Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq );
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+>>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
 			}
 		});
 
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index 3bf46911..4174ca66 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -22,7 +22,6 @@ import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -73,26 +72,22 @@ public class EditLectureSearch_GUI extends JFrame {
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
@@ -191,19 +186,19 @@ public class EditLectureSearch_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(326, 106, 194, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
index eb28246f..a8dcf498 100644
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -3,7 +3,6 @@ package gui.lecture;
 
 import gui.image.CreateImageAllgemein_GUI;
 import gui.image.FTPCreateUploader_GUI;
-
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -11,13 +10,9 @@ 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;
@@ -31,9 +26,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Links;
-
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
@@ -45,30 +38,13 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 	String[] result;
 	private JTextField textField;
 	private JTextField textField_1;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
 	 */
 	public ExtendedSearchForImages_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
+	
 		setResizable(false);
 		
 		try {
diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
index 221ecba7..1e1cf7e0 100644
--- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -43,7 +42,6 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
@@ -69,25 +67,21 @@ public class SearchLecture_GUI extends JFrame {
 			"Verantwortlicher", "Image", "Schlagwort", "ID" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0);
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0);
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
+	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0){
+		 public boolean isCellEditable(int rowIndex, int mColIndex) {
+		        return false;
+		      }
+	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
@@ -187,19 +181,19 @@ public class SearchLecture_GUI extends JFrame {
 		textFieldName.setColumns(10);
 
 		JLabel lblErweiterteSuche = new JLabel(
-				"<html><u>Erweiterte Suche</u></html>");
+				"<html><u>Erweiterte Suche *Folgt noch*</u></html>");
 		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Fenster Extended GUI
 				
-				ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
-				es.setVisible(true);
+				//ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI();
+				//es.setVisible(true);
 			}
 		});
 		lblErweiterteSuche.setForeground(Color.BLUE);
 
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		lblErweiterteSuche.setBounds(315, 106, 205, 14);
 		panel_1.add(lblErweiterteSuche);
 
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java
index 6dc587f1..42eccdec 100644
--- a/Dozentenmodul/src/models/Client.java
+++ b/Dozentenmodul/src/models/Client.java
@@ -3,7 +3,6 @@ package models;
 public class Client {
 
 	private server.Server.Client client;
-	
 	public static Client clientcon=new Client();
 
 	public server.Server.Client getClient() {
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index 0b3c936e..89df5cd5 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -1,21 +1,28 @@
 package models;
 
 public class Image {
+	
 	private String ImageId;
 	private String version;
-
 	private String imagename;
 	private String newName;
 	private String imagepath;
+	private int shareMode;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
 	private int cpu;
 	private long filesize;
-	
 	public static Image image =new Image();
 	
 	
+	
+	public int getShareMode() {
+		return shareMode;
+	}
+	public void setShareMode(int shareMode) {
+		this.shareMode = shareMode;
+	}
 	public String getImagepath() {
 		return imagepath;
 	}
diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java
index 6b7e6fa1..eae05ec5 100644
--- a/Dozentenmodul/src/models/Lecture.java
+++ b/Dozentenmodul/src/models/Lecture.java
@@ -4,7 +4,6 @@ import java.util.Date;
 
 public class Lecture {
 
-	
 	private String name;
 	private String newName;
 	private String shortDesc;
@@ -14,8 +13,6 @@ public class Lecture {
 	private boolean active;
 	private String id;
 	private String linkedImagename;
-	
-	
 	public static Lecture lecture =new Lecture();
 	
 
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 729801e5..860cae35 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -9,6 +9,8 @@ public class Links {
 	
 	private static String FAQ = "http://bwlehrpool.hs-offenburg.de/";
 	private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl";
+	private static String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	private static String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	
 	public static String getFAQ() {
 		return FAQ;
@@ -18,6 +20,7 @@ public class Links {
 		return OTRS;
 	}
 	
+<<<<<<< HEAD
 	public static void openFAQ() {
 		
 		String faq = FAQ;
@@ -95,4 +98,14 @@ public static void openOTRS() {
 		} 
 
 	}
+=======
+	public static String getUriWindows() {
+		return uriWindows;
+	}
+	
+	public static String getUriLinux() {
+		return uriLinux;
+	}
+	
+>>>>>>> 5d24cdec4d239f473ee2359493ab47d1ef3273dd
 }
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/models/person.java
+++ b/Dozentenmodul/src/models/person.java
@@ -3,9 +3,7 @@ package models;
 
 public class person{
 
-
 	private String username;
-
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
 	private String Tel;
 	private String Fakultaet;
 	private boolean ischecked;
-
-	//public static person verantowrtlicher=new person();
 	public static person verantwortlicher=new person();
 	
-	
 	public String getUsername() {
 		return username;
 	}
diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java
index be64937f..9aa958a4 100644
--- a/Dozentenmodul/src/models/user.java
+++ b/Dozentenmodul/src/models/user.java
@@ -4,6 +4,7 @@ public class user {
 	
 	private String userName;
 	private String Password;
+	
 	public String getUserName() {
 		return userName;
 	}
diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java
index 760b8bd0..11a27368 100644
--- a/Dozentenmodul/src/thrift/MasterThriftConnection.java
+++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java
@@ -15,6 +15,8 @@ import thrift.ImageServer.Client;
 public class MasterThriftConnection {
 	
 	public static final String MASTERSERVERIP="132.230.4.16"; 
+	//public static final String MASTERSERVERIP="127.0.0.1"; 
+	
 	final TTransport transport = new TSocket(MASTERSERVERIP, 9090);
 	
 	public Client getMasterThriftConnection()