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

Conflicts: delete Image db and server
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/sql/SQL.java

1 files changed, 3 insertions, 2 deletions

diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index a9125829..2243fd43 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -476,8 +476,9 @@ public class CreateLectureLink_GUI extends JFrame {
 						images.get(x).getLicenseRestriction(),
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
-						images.get(x).getUpdateTime(),
-						images.get(x).getUserData() };
+						images.get(x).getUserData(),
+						images.get(x).getUpdateTime()
+						 };
 				ListObj.add(obj);
 				model.addRow(ListObj.get(x));
 				x++;