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

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/src/server/ServerHandler.java

1 files changed, 8 insertions, 0 deletions

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