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

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 15 insertions, 0 deletions

diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index f4dd5c22..435f3c1d 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -3,6 +3,9 @@ package models;
 
 public class person{
 
+
+	private String username;
+
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -12,9 +15,21 @@ public class person{
 	private boolean ischecked;
 	
 	
+
 	public static person verantowrtlicher=new person();
 	public static person ersteller=new person();
 	
+
+	public static person verantwortlicher=new person();
+	
+	
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
 	public String getName() {
 		return Name;
 	}