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/Image.java b/Dozentenmodul/src/Models/Image.java
index 2a8c4fcd..cdc8264c 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,6 +1,9 @@
 package models;
 
 public class Image {
+	private String ImageId;
+	private String version;
+
 	private String imagename;
 	private String newName;
 	private boolean licensed;
@@ -46,4 +49,16 @@ public class Image {
 	public void setNewName(String newName) {
 		this.newName = newName;
 	}
+	public String getImageId() {
+		return ImageId;
+	}
+	public void setImageId(String imageId) {
+		ImageId = imageId;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
 }