Merge branch 'master' of

https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git

Conflicts:
	src/ui/view/Main.java

src/ui/view/Main.java

@@ -23,14 +23,22 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 
-		
-		// *Design
-		try {
+		if (!System.getProperty("os.name").startsWith("Linux"))
+			// *Design
+			try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
-				| UnsupportedLookAndFeelException e) {
+			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
 			e.printStackTrace();
-		}
+			}
+		else
+			try {
+				UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+					| UnsupportedLookAndFeelException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {