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

Conflicts:
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/server/startServer.class
	Dozentenmodulserver/src/server/startServer.java

1 files changed, 16 insertions, 0 deletions

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index cdc8264c..0b3c936e 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -6,13 +6,22 @@ public class Image {
 
 	private String imagename;
 	private String newName;
+	private String imagepath;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
 	private int cpu;
+	private long filesize;
 	
 	public static Image image =new Image();
 	
+	
+	public String getImagepath() {
+		return imagepath;
+	}
+	public void setImagepath(String imagepath) {
+		this.imagepath = imagepath;
+	}
 	public String getImagename() {
 		return imagename;
 	}
@@ -61,4 +70,11 @@ public class Image {
 	public void setVersion(String version) {
 		this.version = version;
 	}
+	public long getFilesize() {
+		return filesize;
+	}
+	public void setFilesize(long filesize) {
+		this.filesize = filesize;
+	}
+	
 }