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, 26 insertions, 0 deletions

diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
new file mode 100644
index 00000000..8b11c0bc
--- /dev/null
+++ b/Dozentenmodul/src/models/Links.java
@@ -0,0 +1,26 @@
+package models;
+
+public class Links {
+	
+	private static String FAQ = "http://bwlehrpool.hs-offenburg.de/";
+	private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl";
+	private static String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	private static String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	
+	public static String getFAQ() {
+		return FAQ;
+	}
+	
+	public static String getOTRS() {
+		return OTRS;
+	}
+	
+	public static String getUriWindows() {
+		return uriWindows;
+	}
+	
+	public static String getUriLinux() {
+		return uriLinux;
+	}
+	
+}