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

Conflicts:
	fdghf
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java

2 files changed, 24 insertions, 6 deletions

diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java
new file mode 100644
index 00000000..6dc587f1
--- /dev/null
+++ b/Dozentenmodul/src/models/Client.java
@@ -0,0 +1,19 @@
+package models;
+
+public class Client {
+
+	private server.Server.Client client;
+	
+	public static Client clientcon=new Client();
+
+	public server.Server.Client getClient() {
+		return client;
+	}
+
+	public void setClient(server.Server.Client client) {
+		this.client = client;
+	}
+	
+	
+	
+}
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
index 64b84465..fdb5e18a 100644
--- a/Dozentenmodul/src/models/person.java
+++ b/Dozentenmodul/src/models/person.java
@@ -11,13 +11,12 @@ public class person{
 	private String Hochschule;
 	private String EMail;
 	private String Tel;
-	private String Fakultät;
+	private String Fakultaet;
 	private boolean ischecked;
 	
 	
 
 	//public static person verantowrtlicher=new person();
-	public static person ersteller=new person();
 	public static person verantwortlicher=new person();
 	
 	
@@ -58,11 +57,11 @@ public class person{
 	public void setTel(String tel) {
 		Tel = tel;
 	}
-	public String getFakultät() {
-		return Fakultät;
+	public String getFakultaet() {
+		return Fakultaet;
 	}
-	public void setFakultät(String fakultät) {
-		Fakultät = fakultät;
+	public void setFakultaet(String fakultaet) {
+		Fakultaet = fakultaet;
 	}
 	public boolean isIschecked() {
 		return ischecked;