Merge remote-tracking branch 'origin/master' into dev_general

# Conflicts:
#	src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java

src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java

 /*******************************************************************************
- * Copyright (C) 2018 Philipp Spohr
+ * Copyright (C) 2017 Philipp Spohr
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,16 +22,13 @@
 package de.hhu.ba.yoshikoWrapper.help;
 
 import java.util.HashMap;
-import java.util.Map;
 
 public final class HelpLinks {
 
-	public static final Map<String, Object> mainInfo = new HashMap<String,Object>();
+	public static final HashMap<String,Object> mainInfo = new HashMap<String,Object>();
 	static {
-		mainInfo.put("url", "file:///home/philipp/workspace/cs/cytoscape-tutorials/presentations/yoshiko.html");
-		mainInfo.put("title", "Yoshiko Info");
-		//mainInfo.put("id", "AboutYoshiko");
-		//mainInfo.put("url", "https://spqrph.github.io/cytoscape-tutorials/presentations/yoshiko.html#/title");
+		//mainInfo.put("url", "file:///home/philipp/workspace/cs/cytoscape-tutorials/presentations/yoshiko.html");
+		mainInfo.put("url", "https://spqrph.github.io/cytoscape-tutorials/presentations/yoshiko.html#/title");
 	}
 
 }